tjh.dev
1diff --git a/CMakeLists.txt b/CMakeLists.txt
2index c6b2b2a810..1813c88e42 100644
3--- a/CMakeLists.txt
4+++ b/CMakeLists.txt
5@@ -106,7 +106,7 @@ endif ()
6 # Find required dependencies for thrift/lib
7 if (THRIFT_LIB_ONLY OR build_all)
8 find_package(Gflags REQUIRED)
9- find_package(Glog REQUIRED)
10+ find_package(Glog CONFIG REQUIRED)
11 find_package(folly CONFIG REQUIRED)
12 find_package(fizz CONFIG REQUIRED)
13 find_package(wangle CONFIG REQUIRED)
14@@ -119,7 +119,6 @@ if (THRIFT_LIB_ONLY OR build_all)
15 find_package(Threads)
16 include_directories(
17 ${LIBGFLAGS_INCLUDE_DIR}
18- ${GLOG_INCLUDE_DIRS}
19 ${OPENSSL_INCLUDE_DIR}
20 ${ZSTD_INCLUDE_DIRS}
21 ${Xxhash_INCLUDE_DIR}
22diff --git a/thrift/example/cpp2/CMakeLists.txt b/thrift/example/cpp2/CMakeLists.txt
23index afa28dad61..318860b3d6 100644
24--- a/thrift/example/cpp2/CMakeLists.txt
25+++ b/thrift/example/cpp2/CMakeLists.txt
26@@ -28,7 +28,7 @@ target_link_libraries(
27 thriftcpp2
28 chatroom-cpp2
29 ${LIBGFLAGS_LIBRARY}
30- ${GLOG_LIBRARIES}
31+ glog::glog
32 )
33 install(
34 TARGETS example_server
35diff --git a/thrift/lib/cpp/CMakeLists.txt b/thrift/lib/cpp/CMakeLists.txt
36index 6461588a86..8b6ed1b030 100644
37--- a/thrift/lib/cpp/CMakeLists.txt
38+++ b/thrift/lib/cpp/CMakeLists.txt
39@@ -45,7 +45,7 @@ target_link_libraries(
40 PUBLIC
41 Folly::folly
42 ${LIBGFLAGS_LIBRARY}
43- ${GLOG_LIBRARIES}
44+ glog::glog
45 )
46
47 add_library(
48@@ -121,7 +121,7 @@ target_link_libraries(
49 Boost::boost
50 Folly::folly
51 wangle::wangle
52- ${GLOG_LIBRARIES}
53+ glog::glog
54 ${OPENSSL_LIBRARIES}
55 )
56
57@@ -137,7 +137,7 @@ target_link_libraries(
58 thriftprotocol
59 transport
60 Folly::folly
61- ${GLOG_LIBRARIES}
62+ glog::glog
63 )
64
65 set(THRIFT1_HEADER_DIRS
66diff --git a/thrift/lib/cpp2/CMakeLists.txt b/thrift/lib/cpp2/CMakeLists.txt
67index f941688ab0..b3609bbc62 100644
68--- a/thrift/lib/cpp2/CMakeLists.txt
69+++ b/thrift/lib/cpp2/CMakeLists.txt
70@@ -75,7 +75,7 @@ target_link_libraries(
71 Folly::folly
72 thriftmetadata
73 thriftprotocol
74- ${GLOG_LIBRARIES}
75+ glog::glog
76 ${LIBGFLAGS_LIBRARY}
77 )
78
79@@ -206,7 +206,7 @@ target_link_libraries(
80 thrift
81 Folly::folly
82 wangle::wangle
83- ${GLOG_LIBRARIES}
84+ glog::glog
85 thrift-core
86 )
87