tjh.dev
nixpkgs mirror (for testing)
github.com/NixOS/nixpkgs
nix
1diff --git a/CMakeLists.txt b/CMakeLists.txt
2index abbeead..93cac12 100644
3--- a/CMakeLists.txt
4+++ b/CMakeLists.txt
5@@ -136,8 +136,7 @@ find_package(Threads) # this will set ${CMAKE_THREAD_LIBS_INIT} (ie pthreads)
6 find_path(DOUBLECONV_INCLUDE_DIR double-conversion/double-conversion.h)
7 find_library(DOUBLECONV_LIBRARY double-conversion)
8 # Glog
9-find_path(GLOG_INCLUDE_DIR glog/logging.h)
10-find_library(GLOG_LIBRARY glog)
11+find_package(glog REQUIRED)
12 # Gflags
13 find_path(GFLAGS_INCLUDE_DIR gflags/gflags.h)
14 find_library(GFLAGS_LIBRARY gflags)
15@@ -174,7 +173,7 @@ endif()
16 # You can also add jemalloc to the list if you have it/want it
17 target_link_libraries(wdt_min
18 ${FOLLY_LIBRARY}
19- ${GLOG_LIBRARY}
20+ glog::glog
21 ${GFLAGS_LIBRARY}
22 ${Boost_LIBRARIES}
23 ${DOUBLECONV_LIBRARY}
24@@ -226,7 +225,7 @@ if (NOT WDT_USE_SYSTEM_FOLLY)
25 endif()
26
27 add_library(folly4wdt ${FOLLY_CPP_SRC})
28- target_link_libraries(folly4wdt ${GLOG_LIBRARY} ${DOUBLECONV_LIBRARY})
29+ target_link_libraries(folly4wdt glog::glog ${DOUBLECONV_LIBRARY})
30 endif()
31
32 # Order is important - inside fb we want the above
33@@ -234,7 +233,6 @@ endif()
34 include_directories(${CMAKE_CURRENT_BINARY_DIR})
35 include_directories(${FOLLY_INCLUDE_DIR})
36 include_directories(${DOUBLECONV_INCLUDE_DIR})
37-include_directories(${GLOG_INCLUDE_DIR})
38 include_directories(${GFLAGS_INCLUDE_DIR})
39 include_directories(${CMAKE_CURRENT_SOURCE_DIR}/..)
40
41@@ -336,7 +334,7 @@ if (BUILD_TESTING)
42 )
43
44 target_link_libraries(wdtbenchlib
45- ${GLOG_LIBRARY}
46+ glog::glog
47 ${GFLAGS_LIBRARY}
48 )
49