From 1977b69da891d80a4e5d7937e8386bfef82d54b7 Mon Sep 17 00:00:00 2001
From: Lars Bilke <lars.bilke@ufz.de>
Date: Thu, 23 Mar 2023 10:19:39 +0000
Subject: [PATCH] Lower pybind11 and range-v3 version for guix.
---
scripts/cmake/Dependencies.cmake | 17 ++++++++++++-----
web/data/versions.json | 4 +++-
2 files changed, 15 insertions(+), 6 deletions(-)
diff --git a/scripts/cmake/Dependencies.cmake b/scripts/cmake/Dependencies.cmake
index 10a809cc6e8..ed96e59513f 100644
--- a/scripts/cmake/Dependencies.cmake
+++ b/scripts/cmake/Dependencies.cmake
@@ -75,7 +75,10 @@ if(tetgen_ADDED)
list(APPEND DISABLE_WARNINGS_TARGETS tet tetgen)
endif()
-CPMFindPackage(NAME pybind11 GITHUB_REPOSITORY pybind/pybind11 VERSION 2.10.3)
+CPMFindPackage(
+ NAME pybind11 GITHUB_REPOSITORY pybind/pybind11
+ VERSION ${ogs.minimum_version.pybind11}
+)
if(_build_chemistry_lib)
CPMAddPackage(
@@ -91,10 +94,14 @@ if(_build_chemistry_lib)
endif()
set(_eigen_version ${ogs.minimum_version.eigen})
-set(_eigen_url https://gitlab.com/libeigen/eigen/-/archive/${_eigen_version}/eigen-${_eigen_version}.tar.gz)
+set(_eigen_url
+ https://gitlab.com/libeigen/eigen/-/archive/${_eigen_version}/eigen-${_eigen_version}.tar.gz
+)
if(OGS_USE_EIGEN_UNSUPPORTED)
set(_eigen_version 3.4.90)
- set(_eigen_url https://gitlab.com/libeigen/eigen/-/archive/${ogs.minimum_version.eigen-unsupported}/eigen-${ogs.minimum_version.eigen-unsupported}.tar.gz)
+ set(_eigen_url
+ https://gitlab.com/libeigen/eigen/-/archive/${ogs.minimum_version.eigen-unsupported}/eigen-${ogs.minimum_version.eigen-unsupported}.tar.gz
+ )
endif()
CPMFindPackage(
@@ -275,8 +282,8 @@ endif()
CPMFindPackage(
NAME range-v3
GITHUB_REPOSITORY ericniebler/range-v3
- VERSION 0.12.0
- GIT_TAG 0.12.0
+ VERSION ${ogs.minimum_version.range-v3}
+ GIT_TAG ${ogs.minimum_version.range-v3}
EXCLUDE_FROM_ALL YES
)
diff --git a/web/data/versions.json b/web/data/versions.json
index 59f246afd07..2a337b7dd8a 100644
--- a/web/data/versions.json
+++ b/web/data/versions.json
@@ -26,7 +26,9 @@
"tfel-rliv": "4.0",
"tfel-repo": "thelfer",
"lis": "1.7.37",
- "gtest": "1.11.0"
+ "gtest": "1.11.0",
+ "pybind11": "2.8.1",
+ "range-v3": "0.11.0"
},
"tested_version": {
"ubuntu": "22.04",
--
GitLab