From f64b0e204baab829f407ca0451b99e23749b8cc2 Mon Sep 17 00:00:00 2001
From: Lars Bilke <lars.bilke@ufz.de>
Date: Mon, 15 Mar 2021 10:36:53 +0100
Subject: [PATCH] Bump Boost to 1.69.0 for Clang compatibility.
https://github.com/boostorg/build/pull/368
---
scripts/ci/jobs/build_image.yml | 3 +++
scripts/cmake/Dependencies.cmake | 7 ++++++-
web/data/versions.json | 2 +-
3 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/scripts/ci/jobs/build_image.yml b/scripts/ci/jobs/build_image.yml
index cebf249d996..2a8bc9d03e3 100644
--- a/scripts/ci/jobs/build_image.yml
+++ b/scripts/ci/jobs/build_image.yml
@@ -13,12 +13,15 @@ build container images:
- docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
- poetry run ogscm compiler.py ogs.py --build --ogs off
--pm system --cvode --cppcheck --docs --gcovr --mfront --ccache
+ --version_file ../../web/data/versions.json
--tag $CONTAINER_GCC_IMAGE --upload
- poetry run ogscm compiler.py ogs.py --build --ogs off
--pm system --cvode --cppcheck --docs --gcovr --gui --ccache
+ --version_file ../../web/data/versions.json
--tag $CONTAINER_GCC_GUI_IMAGE --upload
- poetry run ogscm compiler.py ogs.py --build --ogs off
--compiler clang --compiler_version 9 --ccache
+ --version_file ../../web/data/versions.json
--tag $CONTAINER_CLANG_IMAGE --upload
### global project images ###
diff --git a/scripts/cmake/Dependencies.cmake b/scripts/cmake/Dependencies.cmake
index dff353566d1..e4a64b8a09a 100644
--- a/scripts/cmake/Dependencies.cmake
+++ b/scripts/cmake/Dependencies.cmake
@@ -115,11 +115,16 @@ if(OGS_USE_MFRONT)
endif()
endif()
+string(REPLACE "." "_" BOOST_VERSION_UNDESCORE ${ogs.minimum_version.boost})
CPMFindPackage(
NAME Boost
- GITHUB_REPOSITORY Orphis/boost-cmake
VERSION ${ogs.minimum_version.boost}
+ URL https://dl.bintray.com/boostorg/release/${ogs.minimum_version.boost}/source/boost_${BOOST_VERSION_UNDESCORE}.tar.gz
)
+if(Boost_ADDED)
+ add_library(Boost::boost INTERFACE IMPORTED)
+ target_include_directories(Boost::boost INTERFACE "${Boost_SOURCE_DIR}")
+endif()
if(OGS_USE_XDMF)
# ZLIB is a HDF5 dependency
diff --git a/web/data/versions.json b/web/data/versions.json
index f7ee6890729..dde12df8ea8 100644
--- a/web/data/versions.json
+++ b/web/data/versions.json
@@ -13,7 +13,7 @@
"git": "2.14",
"cmake": "3.14",
"hugo": "0.64.1",
- "boost": "1.67.0",
+ "boost": "1.69.0",
"eigen": "3.3.9",
"vtk": "8.2.0",
"petsc": "3.11.2",
--
GitLab