Skip to content
Snippets Groups Projects
Commit f64b0e20 authored by Lars Bilke's avatar Lars Bilke
Browse files

Bump Boost to 1.69.0 for Clang compatibility.

parent a4c99704
No related branches found
No related tags found
No related merge requests found
...@@ -13,12 +13,15 @@ build container images: ...@@ -13,12 +13,15 @@ build container images:
- docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
- poetry run ogscm compiler.py ogs.py --build --ogs off - poetry run ogscm compiler.py ogs.py --build --ogs off
--pm system --cvode --cppcheck --docs --gcovr --mfront --ccache --pm system --cvode --cppcheck --docs --gcovr --mfront --ccache
--version_file ../../web/data/versions.json
--tag $CONTAINER_GCC_IMAGE --upload --tag $CONTAINER_GCC_IMAGE --upload
- poetry run ogscm compiler.py ogs.py --build --ogs off - poetry run ogscm compiler.py ogs.py --build --ogs off
--pm system --cvode --cppcheck --docs --gcovr --gui --ccache --pm system --cvode --cppcheck --docs --gcovr --gui --ccache
--version_file ../../web/data/versions.json
--tag $CONTAINER_GCC_GUI_IMAGE --upload --tag $CONTAINER_GCC_GUI_IMAGE --upload
- poetry run ogscm compiler.py ogs.py --build --ogs off - poetry run ogscm compiler.py ogs.py --build --ogs off
--compiler clang --compiler_version 9 --ccache --compiler clang --compiler_version 9 --ccache
--version_file ../../web/data/versions.json
--tag $CONTAINER_CLANG_IMAGE --upload --tag $CONTAINER_CLANG_IMAGE --upload
### global project images ### ### global project images ###
......
...@@ -115,11 +115,16 @@ if(OGS_USE_MFRONT) ...@@ -115,11 +115,16 @@ if(OGS_USE_MFRONT)
endif() endif()
endif() endif()
string(REPLACE "." "_" BOOST_VERSION_UNDESCORE ${ogs.minimum_version.boost})
CPMFindPackage( CPMFindPackage(
NAME Boost NAME Boost
GITHUB_REPOSITORY Orphis/boost-cmake
VERSION ${ogs.minimum_version.boost} 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) if(OGS_USE_XDMF)
# ZLIB is a HDF5 dependency # ZLIB is a HDF5 dependency
......
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
"git": "2.14", "git": "2.14",
"cmake": "3.14", "cmake": "3.14",
"hugo": "0.64.1", "hugo": "0.64.1",
"boost": "1.67.0", "boost": "1.69.0",
"eigen": "3.3.9", "eigen": "3.3.9",
"vtk": "8.2.0", "vtk": "8.2.0",
"petsc": "3.11.2", "petsc": "3.11.2",
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment