pkgs/by-name/fb/fb303/glog-0.7.patch at devShellTools-shell · tjh.dev/nixpkgs

tjh.dev / nixpkgs

Clone of https://github.com/NixOS/nixpkgs.git (to stress-test knotserver)

nixpkgs / pkgs / by-name / fb / fb303 / glog-0.7.patch

at devShellTools-shell 29 lines 626 B view raw

 1diff --git a/CMakeLists.txt b/CMakeLists.txt
 2index 477b8d6a55..cfeae9ab3f 100644
 3--- a/CMakeLists.txt
 4+++ b/CMakeLists.txt
 5@@ -56,7 +56,7 @@
 6 
 7 find_package(Gflags REQUIRED)
 8 
 9-find_package(Glog MODULE REQUIRED)
10+find_package(Glog CONFIG REQUIRED)
11 
12 find_package(folly CONFIG REQUIRED)
13 
14@@ -88,7 +88,6 @@
15 
16 target_include_directories(fb303 PUBLIC
17   ${GFLAGS_INCLUDE_DIR}
18-  ${GLOG_INCLUDE_DIR}
19   ${DOUBLE_CONVERSION_INCLUDE_DIR}
20   $<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}>
21   $<INSTALL_INTERFACE:${INCLUDE_INSTALL_DIR}>
22@@ -98,6 +97,7 @@
23   fb303_thrift_cpp
24   Folly::folly
25   FBThrift::thrift
26+  glog::glog
27 )
28 
29 install(