diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2f214f5..b45f528 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -118,12 +118,15 @@ endif ()
 
 # Find required dependencies for thrift/lib
 if (THRIFT_LIB_ONLY OR build_all)
-  find_package(Gflags REQUIRED)
-  find_package(Glog REQUIRED)
+  find_package(gflags CONFIG REQUIRED)
+  set(LIBGFLAGS_LIBRARY gflags::gflags)
+  find_package(glog CONFIG REQUIRED)
+  set(GLOG_LIBRARIES glog::glog)
   find_package(fizz CONFIG REQUIRED)
   find_package(wangle CONFIG REQUIRED)
   find_package(ZLIB REQUIRED)
-  find_package(Zstd REQUIRED)
+  find_package(zstd CONFIG REQUIRED)
+  set(ZSTD_LIBRARIES zstd::libzstd)
   find_package(Xxhash REQUIRED)
   find_package(mvfst CONFIG REQUIRED)
   # https://cmake.org/cmake/help/v3.9/module/FindThreads.html
diff --git a/thrift/cmake/FBThriftConfig.cmake.in b/thrift/cmake/FBThriftConfig.cmake.in
index e279485..4dd8bd1 100644
--- a/thrift/cmake/FBThriftConfig.cmake.in
+++ b/thrift/cmake/FBThriftConfig.cmake.in
@@ -29,9 +29,16 @@ else()
   set_and_check(FBTHRIFT_COMPILER "@PACKAGE_BIN_INSTALL_DIR@/thrift1")
 endif()
 
-find_dependency(Xxhash REQUIRED)
-find_dependency(ZLIB REQUIRED)
-find_package(mvfst CONFIG REQUIRED)
+find_dependency(xxHash CONFIG)
+find_dependency(ZLIB)
+find_dependency(mvfst CONFIG)
+find_dependency(fizz CONFIG)
+find_dependency(fmt CONFIG)
+find_dependency(folly CONFIG)
+find_dependency(gflags CONFIG)
+find_dependency(glog CONFIG)
+find_dependency(wangle CONFIG)
+find_dependency(zstd CONFIG)
 
 if (NOT TARGET FBThrift::thriftcpp2)
   include("${FBTHRIFT_CMAKE_DIR}/FBThriftTargets.cmake")