diff --git a/scripts/cmake/Dependencies.cmake b/scripts/cmake/Dependencies.cmake index ed96e59513fa8816c66ee9c35beaa1aa26057958..cd769105da31eb8ad8ca70cdb324161d8ffe894f 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 2a337b7dd8addceadc6a108cc9ecee150cd8f021..d9f2a0e36455a8ff5f5c72f8003dfab74cf337f6 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",