Merge branch 'pybind11-gcc14' into 'master'

[cmake] Use pybind11 with a fix for gcc14. See merge request ogs/ogs!5119
ufz · Sep 27, 2024 · 2344e80 · 2344e80
2 parents b07c464 + d68fe56
commit 2344e80
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/scripts/cmake/Dependencies.cmake b/scripts/cmake/Dependencies.cmake
@@ -83,10 +83,14 @@ else()
     list(APPEND DISABLE_WARNINGS_TARGETS tet tetgen)
 endif()
 
-CPMFindPackage(
-    NAME pybind11 GITHUB_REPOSITORY pybind/pybind11
-    VERSION ${ogs.minimum_version.pybind11} SYSTEM TRUE
-)
+if(GUIX_BUILD)
+    find_package(pybind11 REQUIRED)
+else()
+    CPMFindPackage(
+        NAME pybind11 GITHUB_REPOSITORY pybind/pybind11
+        VERSION ${ogs.minimum_version.pybind11} SYSTEM TRUE
+    )
+endif()
 
 if(_build_chemistry_lib)
     if(GUIX_BUILD)

diff --git a/web/data/versions.json b/web/data/versions.json
@@ -25,7 +25,7 @@
     "tfel-repo": "thelfer",
     "lis": "1.7.37",
     "gtest": "1.13.0",
-    "pybind11": "2.10.4",
+    "pybind11": "2.13.2",
     "range-v3": "0.12.0",
     "json": "3.10.5",
     "json_sha": "b94997df68856753b72f0d7a3703b7d484d4745c567f3584ef97c96c25a5798e"