646b892680
Some checks failed
Periodic Merges (6h) / master → staging-nixos (push) Failing after 12m50s
Periodic Merges (6h) / master → staging-next (push) Failing after 12m54s
Periodic Merges (24h) / merge-base(master,staging) → haskell-updates (push) Failing after 11m54s
Periodic Merges (6h) / staging-next → staging (push) Failing after 12m13s
Periodic Merges (24h) / staging-next-25.05 → staging-25.05 (push) Failing after 13m24s
Periodic Merges (24h) / release-25.05 → staging-next-25.05 (push) Failing after 14m28s
30 lines
626 B
Diff
30 lines
626 B
Diff
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
index 477b8d6a55..cfeae9ab3f 100644
|
|
--- a/CMakeLists.txt
|
|
+++ b/CMakeLists.txt
|
|
@@ -56,7 +56,7 @@
|
|
|
|
find_package(Gflags REQUIRED)
|
|
|
|
-find_package(Glog MODULE REQUIRED)
|
|
+find_package(Glog CONFIG REQUIRED)
|
|
|
|
find_package(folly CONFIG REQUIRED)
|
|
|
|
@@ -88,7 +88,6 @@
|
|
|
|
target_include_directories(fb303 PUBLIC
|
|
${GFLAGS_INCLUDE_DIR}
|
|
- ${GLOG_INCLUDE_DIR}
|
|
${DOUBLE_CONVERSION_INCLUDE_DIR}
|
|
$<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}>
|
|
$<INSTALL_INTERFACE:${INCLUDE_INSTALL_DIR}>
|
|
@@ -98,6 +97,7 @@
|
|
fb303_thrift_cpp
|
|
Folly::folly
|
|
FBThrift::thrift
|
|
+ glog::glog
|
|
)
|
|
|
|
install(
|