From 7dff36f4370eb72e528710ef80f1d0eb0d95cc0c Mon Sep 17 00:00:00 2001
From: Lars Bilke <lars.bilke@ufz.de>
Date: Thu, 30 Mar 2023 13:49:50 +0000
Subject: [PATCH] [cmake] Fix range-v3 versions.
---
scripts/cmake/Dependencies.cmake | 18 +++++++++++-------
web/data/versions.json | 2 +-
2 files changed, 12 insertions(+), 8 deletions(-)
diff --git a/scripts/cmake/Dependencies.cmake b/scripts/cmake/Dependencies.cmake
index ed96e59513f..cd769105da3 100644
--- a/scripts/cmake/Dependencies.cmake
+++ b/scripts/cmake/Dependencies.cmake
@@ -279,13 +279,17 @@ if(exprtk_ADDED)
target_include_directories(exprtk SYSTEM INTERFACE ${exprtk_SOURCE_DIR})
endif()
-CPMFindPackage(
- NAME range-v3
- GITHUB_REPOSITORY ericniebler/range-v3
- VERSION ${ogs.minimum_version.range-v3}
- GIT_TAG ${ogs.minimum_version.range-v3}
- EXCLUDE_FROM_ALL YES
-)
+if(GUIX_BUILD)
+ find_package(range-v3 REQUIRED)
+else()
+ CPMFindPackage(
+ NAME range-v3
+ GITHUB_REPOSITORY ericniebler/range-v3
+ VERSION ${ogs.minimum_version.range-v3}
+ GIT_TAG ${ogs.minimum_version.range-v3}
+ EXCLUDE_FROM_ALL YES
+ )
+endif()
if(OGS_BUILD_TESTING OR OGS_BUILD_UTILS)
CPMAddPackage(
diff --git a/web/data/versions.json b/web/data/versions.json
index 2a337b7dd8a..d9f2a0e3645 100644
--- a/web/data/versions.json
+++ b/web/data/versions.json
@@ -28,7 +28,7 @@
"lis": "1.7.37",
"gtest": "1.11.0",
"pybind11": "2.8.1",
- "range-v3": "0.11.0"
+ "range-v3": "0.12.0"
},
"tested_version": {
"ubuntu": "22.04",
--
GitLab