Skip to content

Commit 70fd631

Browse files
authored
glog: add version 0.6.0 and disable new dependencies (#719)
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: #718
1 parent 8c3a9ba commit 70fd631

File tree

2 files changed

+18
-2
lines changed

2 files changed

+18
-2
lines changed

cmake/configs/default.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -308,7 +308,7 @@ hunter_default_version(glfw VERSION 3.3.4-p0)
308308
hunter_default_version(glib VERSION 2.54.0)
309309
hunter_default_version(glm VERSION 0.9.9.8)
310310
hunter_default_version(globjects VERSION 1.1.0-p0)
311-
hunter_default_version(glog VERSION 0.5.0)
311+
hunter_default_version(glog VERSION 0.6.0)
312312
hunter_default_version(glproto VERSION 1.4.17)
313313
hunter_default_version(glslang VERSION 8.13.3743-9eef54b2-p0)
314314
hunter_default_version(glu VERSION 9.0.1-p1)

cmake/projects/glog/hunter.cmake

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,8 +86,24 @@ hunter_add_version(
8686
d4c64e1b2de9cfc52970532b301106ed94e94991
8787
)
8888

89+
hunter_add_version(
90+
PACKAGE_NAME
91+
glog
92+
VERSION
93+
"0.6.0"
94+
URL
95+
"https://github.com/google/glog/archive/refs/tags/v0.6.0.tar.gz"
96+
SHA1
97+
31376c7916aee2fc6375994468744123ad6179b9
98+
)
99+
89100
# explicitly remove dependency on gflags (only needed for tests)
90-
hunter_cmake_args(glog CMAKE_ARGS WITH_GFLAGS=OFF BUILD_TESTING=OFF)
101+
hunter_cmake_args(glog CMAKE_ARGS
102+
WITH_GFLAGS=OFF
103+
WITH_UNWIND=OFF # since 0.5.0
104+
WITH_GTEST=OFF # since 0.6.0
105+
BUILD_TESTING=OFF
106+
)
91107

92108
hunter_pick_scheme(DEFAULT url_sha1_cmake)
93109
hunter_cacheable(glog)

0 commit comments

Comments
 (0)