pkgs/by-name/ed/edencommon/glog-0.7.patch at devShellTools-shell

tjh.dev / nixpkgs

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

nixpkgs / pkgs / by-name / ed / edencommon / glog-0.7.patch

at devShellTools-shell 27 lines 806 B view raw

wrap content

 1diff --git a/CMakeLists.txt b/CMakeLists.txt
 2index 8d7b3454df..2ce7b5af1a 100644
 3--- a/CMakeLists.txt
 4+++ b/CMakeLists.txt
 5@@ -50,8 +50,7 @@
 6   "${CMAKE_CURRENT_SOURCE_DIR}/build/fbcode_builder/CMake"
 7   ${CMAKE_MODULE_PATH})
 8 
 9-find_package(Glog MODULE REQUIRED)
10-include_directories(${GLOG_INCLUDE_DIR})
11+find_package(Glog CONFIG REQUIRED)
12 
13 find_package(Gflags REQUIRED)
14 include_directories(${GFLAGS_INCLUDE_DIR})
15diff --git a/eden/common/testharness/CMakeLists.txt b/eden/common/testharness/CMakeLists.txt
16index bef7421906..f35067efa9 100644
17--- a/eden/common/testharness/CMakeLists.txt
18+++ b/eden/common/testharness/CMakeLists.txt
19@@ -19,7 +19,7 @@
20     ${BOOST_LIBRARIES}
21     Folly::folly_test_util
22     ${LIBGMOCK_LIBRARIES}
23-    ${GLOG_LIBRARY}
24+    glog::glog
25 )
26 
27 target_include_directories(