diff --git a/.cmake-format.yaml b/.cmake-format.yaml index acc977940b1681e6c5b578a35a416720c50030d2..539192c92ab75d43b407a40dd102b69aae1bd1dd 100644 --- a/.cmake-format.yaml +++ b/.cmake-format.yaml @@ -158,3 +158,4 @@ parse: INSTALL_COMMAND: + BUILD_IN_SOURCE: 1 LOG_OUTPUT_ON_FAILURE: 1 + CMAKE_ARGS: + diff --git a/scripts/ci/jobs/build-linux.yml b/scripts/ci/jobs/build-linux.yml index ff416ff37d16f4964e03000b4642f1270c1c4246..c3a0a1daab9f02b1eccd292ebc87f23adde2fc36 100644 --- a/scripts/ci/jobs/build-linux.yml +++ b/scripts/ci/jobs/build-linux.yml @@ -71,17 +71,27 @@ build linux (no deps, no procs): BUILD_PROCESSES: "SteadyStateDiffusion" CMAKE_PRESET: ci-simplest -build linux native: +build linux arch: extends: - .template-build-linux - .test-artifacts tags: [shell, envinf] needs: [meta] variables: - CMAKE_PRESET: release + CMAKE_PRESET: release-all CMAKE_ARGS: >- -DBUILD_SHARED_LIBS=ON -DOGS_USE_CONAN=OFF -DOGS_USE_POETRY=OFF - -DOGS_USE_MFRONT=ON - -DOGS_USE_XDMF=ON + +build linux ubuntu: + extends: + - .template-build-linux + - .test-artifacts + - .rules-master-manual + tags: [shell, ubuntu] + needs: [meta] + variables: + CMAKE_PRESET: release-all + CMAKE_ARGS: >- + -DOGS_USE_CONAN=OFF diff --git a/scripts/cmake/DependenciesExternalProject.cmake b/scripts/cmake/DependenciesExternalProject.cmake index a9edd533a348fecb97860964b9bf19a74e058161..032ea1b7324471acf7fd01cb7c1cb3950b1c68d7 100644 --- a/scripts/cmake/DependenciesExternalProject.cmake +++ b/scripts/cmake/DependenciesExternalProject.cmake @@ -8,6 +8,9 @@ if(OGS_USE_MFRONT) BuildExternalProject( TFEL GIT_REPOSITORY https://github.com/thelfer/tfel.git GIT_TAG rliv-${ogs.minimum_version.tfel-rliv} + CMAKE_ARGS + -DCMAKE_INSTALL_RPATH=<INSTALL_DIR>/lib + -DCMAKE_INSTALL_RPATH_USE_LINK_PATH=TRUE ) set(ENV{TFELHOME} ${PROJECT_BINARY_DIR}/_ext/TFEL) endif()