Merge branch 'ci-fix' into 'master'

Several CI fixes

See merge request ogs/ogs!3625

MaterialLib/FractureModels/CMakeLists.txt

@@ -2,4 +2,6 @@ get_source_files(SOURCES)
 append_source_files(SOURCES Permeability)
 
 ogs_add_library(MaterialLib_FractureModels ${SOURCES})
-target_link_libraries(MaterialLib_FractureModels PUBLIC MathLib)
+target_link_libraries(
+    MaterialLib_FractureModels PUBLIC MathLib PRIVATE ParameterLib NumLib
+)

MaterialLib/SolidModels/CMakeLists.txt

@@ -2,7 +2,8 @@ get_source_files(SOURCES)
 
 ogs_add_library(MaterialLib_SolidModels ${SOURCES})
 target_link_libraries(
-    MaterialLib_SolidModels PUBLIC MathLib PRIVATE spdlog::spdlog
+    MaterialLib_SolidModels PUBLIC MathLib PRIVATE spdlog::spdlog ParameterLib
+                                                   NumLib
 )
 
 if(OGS_USE_MFRONT)

container-maker @ f854e10b

-Subproject commit 6c9873d9a50677f67e3642b2d4bfc4e1e1e7b532
+Subproject commit f854e10b2ae9e69b46464476bd84131de6aa4fd6

scripts/ci/extends/container-maker-setup.yml

 .container-maker-setup:
   before_script:
-    - git submodule update --init ThirdParty/container-maker
+    - git submodule update --init --force ThirdParty/container-maker
     - cd ThirdParty/container-maker
     - rm -rf _out .venv
     - poetry install

scripts/cmake/CPM.cmake

-set(CPM_DOWNLOAD_VERSION 0.31.1)
+set(CPM_DOWNLOAD_VERSION 0.32.1)
 
 if(CPM_SOURCE_CACHE)
   # Expand relative path. This is important if the provided path contains a tilde (~)

scripts/cmake/Dependencies.cmake

 set(CMAKE_FOLDER ThirdParty)
 
+# ccache
+if(NOT WIN32 AND CCACHE_TOOL_PATH AND NOT OGS_DISABLE_COMPILER_CACHE)
+    set(CCACHE_OPTIONS "CCACHE_SLOPPINESS=pch_defines,time_macros")
+    if(${CMAKE_CXX_COMPILER_ID} MATCHES "Clang|AppleClang")
+        list(APPEND CCACHE_OPTIONS "CCACHE_CPP2=true")
+    endif()
+    CPMAddPackage(
+        NAME Ccache.cmake
+        GITHUB_REPOSITORY TheLartians/Ccache.cmake
+        VERSION 1.2.2
+        OPTIONS "USE_CCACHE ON"
+    )
+endif()
+
 if(OGS_BUILD_TESTING)
     CPMAddPackage(
         NAME googletest
@@ -129,8 +143,8 @@ CPMFindPackage(
     NAME LibXml2
     GITHUB_REPOSITORY GNOME/libxml2
     VERSION ${ogs.minimum_version.libxml2}
-    GIT_TAG f93ca3e140a371b26366f747a408588c631e0fd1
-    OPTIONS "LIBXML2_WITH_TESTS OFF"
+    OPTIONS "BUILD_SHARED_LIBS OFF"
+            "LIBXML2_WITH_TESTS OFF"
             "LIBXML2_WITH_PROGRAMS OFF"
             "LIBXML2_WITH_ICONV OFF"
             "LIBXML2_WITH_ICU OFF"
@@ -142,6 +156,7 @@ CPMFindPackage(
 if(LibXml2_ADDED)
     add_library(LibXml2::LibXml2 ALIAS LibXml2)
     set(LIBXML2_INCLUDE_DIR ${LibXml2_SOURCE_DIR})
+    list(APPEND DISABLE_WARNINGS_TARGETS LibXml2)
 endif()
 
 CPMAddPackage(
@@ -192,6 +207,7 @@ if(OGS_USE_XDMF)
         set(HDF5_INCLUDE_DIR ${HDF5_SOURCE_DIR})
     endif()
 
+    set(XDMF_LIBNAME OgsXdmf CACHE STRING "")
     CPMAddPackage(
         NAME xdmf
         VERSION 3.0.0
@@ -361,6 +377,10 @@ else()
         list(APPEND VTK_OPTIONS "Module_${comp} ON")
     endforeach()
 
+    # Workaround for configuration error in [vtk]/CMake/vtkGroups.cmake:43
+    set(VTK_Group_Rendering OFF CACHE BOOL "")
+    set(VTK_Group_StandAlone OFF CACHE BOOL "")
+
     CPMAddPackage(
         NAME VTK
         GITHUB_REPOSITORY kitware/vtk
@@ -431,20 +451,6 @@ cpm_licenses_create_disclaimer_target(
     "${CPM_PACKAGES}"
 )
 
-# ccache
-if(NOT WIN32 AND CCACHE_TOOL_PATH AND NOT OGS_DISABLE_COMPILER_CACHE)
-    set(CCACHE_OPTIONS "CCACHE_SLOPPINESS=pch_defines,time_macros")
-    if(${CMAKE_CXX_COMPILER_ID} MATCHES "Clang|AppleClang")
-        list(APPEND CCACHE_OPTIONS "CCACHE_CPP2=true")
-    endif()
-    CPMAddPackage(
-        NAME Ccache.cmake
-        GITHUB_REPOSITORY TheLartians/Ccache.cmake
-        VERSION 1.2.2
-        OPTIONS "USE_CCACHE ON"
-    )
-endif()
-
 CPMAddPackage(
     NAME GroupSourcesByFolder.cmake
     GITHUB_REPOSITORY TheLartians/GroupSourcesByFolder.cmake VERSION 1.0

scripts/cmake/test/CTestCustom.in.cmake

@@ -10,3 +10,7 @@ foreach(line IN LISTS LINES)
     # and write the (changed) line ...
     file(APPEND "@PROJECT_BINARY_DIR@/CTestTestfile.cmake" "${STRIPPED}\n")
 endforeach()
+
+# Limit test output to 1 GB to prevent lower default limit in Dash-mode
+set(CTEST_CUSTOM_MAXIMUM_FAILED_TEST_OUTPUT_SIZE 1073741824)
+set(CTEST_CUSTOM_MAXIMUM_PASSED_TEST_OUTPUT_SIZE 1073741824)

web/data/versions.json

@@ -21,7 +21,7 @@
     "python": "3.6",
     "snakemake": "5.27.4",
     "hdf5": "1.10.5",
-    "libxml2": "2.9.10"
+    "libxml2": "2.9.12"
   },
   "tested_version": {
     "ubuntu": "20.04",