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
22 lines
590 B
Diff
22 lines
590 B
Diff
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
index dd6eec3320..ee74ab0008 100644
|
|
--- a/CMakeLists.txt
|
|
+++ b/CMakeLists.txt
|
|
@@ -333,7 +333,7 @@
|
|
find_package(Gflags REQUIRED)
|
|
include_directories(SYSTEM ${GFLAGS_INCLUDE_DIR})
|
|
|
|
-find_package(Glog REQUIRED)
|
|
+find_package(Glog CONFIG REQUIRED)
|
|
add_compile_definitions(GLOG_NO_ABBREVIATED_SEVERITIES)
|
|
|
|
# We indirectly depend on boost. This logic needs to match
|
|
@@ -479,7 +479,6 @@
|
|
)
|
|
target_include_directories(third_party_deps INTERFACE
|
|
${FOLLY_INCLUDE_DIR}
|
|
- ${GLOG_INCLUDE_DIR}
|
|
${GFLAGS_INCLUDE_DIR}
|
|
${Boost_INCLUDE_DIRS}
|
|
)
|