Merge pull request cpp-pm#636 from NeroBurner/glog

glog: update to version 0.3.4-p2
qdrvm · Jan 16, 2017 · 5945a47 · 5945a47
2 parents 7c273a3 + 471a6ce
commit 5945a47
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 2 deletions.
diff --git a/cmake/configs/default.cmake b/cmake/configs/default.cmake
@@ -123,7 +123,7 @@ hunter_config(gflags VERSION 2.1.2-p1)
 hunter_config(glew VERSION 2.0.0)
 hunter_config(glfw VERSION 3.2-p0)
 hunter_config(glm VERSION 0.9.7.6)
-hunter_config(glog VERSION 0.3.4-p1)
+hunter_config(glog VERSION 0.3.4-p2)
 hunter_config(glproto VERSION 1.4.17)
 hunter_config(half VERSION 1.1.0-p1)
 hunter_config(hdf5 VERSION 1.8.15-p1)

diff --git a/cmake/projects/glog/hunter.cmake b/cmake/projects/glog/hunter.cmake
@@ -4,10 +4,22 @@
 # !!! DO NOT PLACE HEADER GUARDS HERE !!!
 
 include(hunter_add_version)
+include(hunter_cmake_args)
 include(hunter_cacheable)
 include(hunter_download)
 include(hunter_pick_scheme)
 
+hunter_add_version(
+    PACKAGE_NAME
+    glog
+    VERSION
+    "0.3.4-p2"
+    URL
+    "https://github.com/hunter-packages/glog/archive/v0.3.4-p2.tar.gz"
+    SHA1
+    61e308854b397e68435994818fefb0ff6e1bbccb
+)
+
 hunter_add_version(
     PACKAGE_NAME
     glog
@@ -19,6 +31,9 @@ hunter_add_version(
     512b8ad6d9aae9499cca2e4c4530b9386cb05440
 )
 
+# explicitly remove dependency on gflags (only needed for tests)
+hunter_cmake_args(glog CMAKE_ARGS WITH_GFLAGS=OFF)
+
 hunter_pick_scheme(DEFAULT url_sha1_cmake)
 hunter_cacheable(glog)
 hunter_download(PACKAGE_NAME glog)
diff --git a/examples/glog/CMakeLists.txt b/examples/glog/CMakeLists.txt
@@ -14,7 +14,7 @@ hunter_add_package(glog)
 find_package(glog CONFIG REQUIRED)
 
 add_executable(foo foo.cpp)
-target_link_libraries(foo glog)
+target_link_libraries(foo glog::glog)
 
 if(ANDROID)
   hunter_add_package(Android-Apk)