blob: 65c2fe11d39d7171709fc7b19e778f1a81e656a4 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
|
--- folly/CMake/folly-deps.cmake.orig 2025-07-15 18:52:36.766025683 -0400
+++ folly/CMake/folly-deps.cmake 2025-07-15 18:54:17.271772559 -0400
@@ -64,10 +64,18 @@
set(FOLLY_LIBGFLAGS_INCLUDE ${LIBGFLAGS_INCLUDE_DIR})
endif()
-find_package(Glog MODULE)
-set(FOLLY_HAVE_LIBGLOG ${GLOG_FOUND})
-list(APPEND FOLLY_LINK_LIBRARIES ${GLOG_LIBRARY})
-list(APPEND FOLLY_INCLUDE_DIRECTORIES ${GLOG_INCLUDE_DIR})
+# Detect glog with CONFIG first
+find_package(glog CONFIG QUIET)
+if(glog_FOUND)
+ set(FOLLY_HAVE_LIBGLOG True)
+ list(APPEND FOLLY_LINK_LIBRARIES glog::glog)
+else()
+ # Fallback to module mode
+ find_package(Glog MODULE REQUIRED)
+ set(FOLLY_HAVE_LIBGLOG ${GLOG_FOUND})
+ list(APPEND FOLLY_LINK_LIBRARIES ${GLOG_LIBRARY})
+ list(APPEND FOLLY_INCLUDE_DIRECTORIES ${GLOG_INCLUDE_DIR})
+endif()
|