Merge branch 'fix-mfront' into 'master'

[ci] Enable mfront in serial container

See merge request ogs/ogs!3508

MaterialLib/SolidModels/MFront/CMakeLists.txt

@@ -38,3 +38,5 @@ target_link_libraries(MaterialLib_SolidModels_MFront
                       PUBLIC MFrontGenericInterface)
 target_compile_definitions(MaterialLib_SolidModels_MFront
                            PRIVATE OGS_USE_MFRONT)
+
+install(TARGETS MFrontGenericInterface OgsMFrontBehaviour)

container-maker @ f3b23f2a

-Subproject commit a7e952f1bf9b9950c1808c098a91bb65d46db2e4
+Subproject commit f3b23f2ac47237ee1fc2c19b09125b7a23201047

scripts/ci/jobs/build_image.yml

@@ -12,13 +12,16 @@ build container images:
   script:
     - 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 --tfel --ccache
+      --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 ###

scripts/ci/jobs/container.yml

@@ -19,7 +19,7 @@ container:
     - >
       poetry run ogscm compiler.py ogs.py -B -C -R --ogs ../..
       --build_args ' --progress=plain'
-      --pm system --cvode --ccache
+      --pm system --cvode --ccache --mfront
       --cmake_args ' -DOGS_CPU_ARCHITECTURE=sandybridge -DBUILD_TESTING=OFF'
       $DOCKER_TAG
     - >

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

web/content/docs/devguide/advanced/singularity.md

@@ -9,6 +9,14 @@ weight = 1036
     parent = "advanced"
 +++
 
+<div class='note'>
+
+### Important note
+
+This page describes how to **build** OGS with the help of a Linux container (for **developers**). To **run** OGS with the help of a container go to the [user guide]({{< ref "container.md" >}}) (for **developers**).
+
+</div>
+
 ## Introduction
 
 [Singularity](https://www.sylabs.io) is a Linux container runtime similar to Docker. Key advantages over Docker are

web/content/docs/userguide/basics/container.md

 +++
-date = "2018-11-14T15:00:13+01`:00"
+date = "2018-11-14T15:00:13+01:00"
 title = "Running OGS in a container"
 author = "Lars Bilke"
 weight = 10
@@ -9,6 +9,14 @@ weight = 10
     parent = "basics"
 +++
 
+<div class='note'>
+
+### Important note
+
+This page describes how to **run** OGS with the help of a Linux container (for **users**). To **build** OGS with the help of a container go to the [developer guide]({{< ref "singularity.md" >}}) (for **developers**).
+
+</div>
+
 ## With Singularity
 
 ### Prerequisites

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",