From 1a4c74bb8d973d9971e24d7c0af80463ec162810 Mon Sep 17 00:00:00 2001 From: Reinhold Gschweicher Date: Mon, 30 Oct 2023 16:14:05 +0100 Subject: [PATCH] glog: add version 0.6.0 and disable new dependencies Disable optional dependencies searched for in upstream, we want to stay reproducible. - `WITH_UNWIND=OFF`: flag introduced with 0.5.0 - `WITH_GTEST=OFF`: flag introduced with 0.6.0 Fixes: https://github.com/cpp-pm/hunter/issues/718 --- cmake/configs/default.cmake | 2 +- cmake/projects/glog/hunter.cmake | 18 +++++++++++++++++- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/cmake/configs/default.cmake b/cmake/configs/default.cmake index a16c2276d0..8025223908 100644 --- a/cmake/configs/default.cmake +++ b/cmake/configs/default.cmake @@ -308,7 +308,7 @@ hunter_default_version(glfw VERSION 3.3.4-p0) hunter_default_version(glib VERSION 2.54.0) hunter_default_version(glm VERSION 0.9.9.8) hunter_default_version(globjects VERSION 1.1.0-p0) -hunter_default_version(glog VERSION 0.5.0) +hunter_default_version(glog VERSION 0.6.0) hunter_default_version(glproto VERSION 1.4.17) hunter_default_version(glslang VERSION 8.13.3743-9eef54b2-p0) hunter_default_version(glu VERSION 9.0.1-p1) diff --git a/cmake/projects/glog/hunter.cmake b/cmake/projects/glog/hunter.cmake index a5467c3a53..5eab06f099 100644 --- a/cmake/projects/glog/hunter.cmake +++ b/cmake/projects/glog/hunter.cmake @@ -86,8 +86,24 @@ hunter_add_version( d4c64e1b2de9cfc52970532b301106ed94e94991 ) +hunter_add_version( + PACKAGE_NAME + glog + VERSION + "0.6.0" + URL + "https://github.com/google/glog/archive/refs/tags/v0.6.0.tar.gz" + SHA1 + 31376c7916aee2fc6375994468744123ad6179b9 +) + # explicitly remove dependency on gflags (only needed for tests) -hunter_cmake_args(glog CMAKE_ARGS WITH_GFLAGS=OFF BUILD_TESTING=OFF) +hunter_cmake_args(glog CMAKE_ARGS + WITH_GFLAGS=OFF + WITH_UNWIND=OFF # since 0.5.0 + WITH_GTEST=OFF # since 0.6.0 + BUILD_TESTING=OFF +) hunter_pick_scheme(DEFAULT url_sha1_cmake) hunter_cacheable(glog)