tjh.dev
nixpkgs mirror (for testing)
github.com/NixOS/nixpkgs
nix
1diff --git a/CMakeLists.txt b/CMakeLists.txt
2index 492bcccd9a..9c907a87a8 100644
3--- a/CMakeLists.txt
4+++ b/CMakeLists.txt
5@@ -108,7 +108,7 @@
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(fizz CONFIG REQUIRED)
12 find_package(wangle CONFIG REQUIRED)
13 find_package(ZLIB REQUIRED)
14@@ -120,7 +120,6 @@
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 @@
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 2c65e1f0a8..1e80060100 100644
37--- a/thrift/lib/cpp/CMakeLists.txt
38+++ b/thrift/lib/cpp/CMakeLists.txt
39@@ -43,7 +43,7 @@
40 PUBLIC
41 Folly::folly
42 ${LIBGFLAGS_LIBRARY}
43- ${GLOG_LIBRARIES}
44+ glog::glog
45 )
46
47 add_library(
48@@ -121,7 +121,7 @@
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 @@
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 03216f5d6f..5f31fc0c64 100644
68--- a/thrift/lib/cpp2/CMakeLists.txt
69+++ b/thrift/lib/cpp2/CMakeLists.txt
70@@ -75,7 +75,7 @@
71 Folly::folly
72 thriftmetadata
73 thriftprotocol
74- ${GLOG_LIBRARIES}
75+ glog::glog
76 ${LIBGFLAGS_LIBRARY}
77 )
78
79@@ -207,7 +207,7 @@
80 thrift
81 Folly::folly
82 wangle::wangle
83- ${GLOG_LIBRARIES}
84+ glog::glog
85 thrift-core
86 )
87