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

Merge branch 'mfront-rpath-fix' into 'master'

[cmake] Fix rpath for mfront / tfel on Ubuntu.

Closes #3165

See merge request ogs/ogs!3689
parents 99df01fd 107be7c7
No related branches found
No related tags found
No related merge requests found
......@@ -158,3 +158,4 @@ parse:
INSTALL_COMMAND: +
BUILD_IN_SOURCE: 1
LOG_OUTPUT_ON_FAILURE: 1
CMAKE_ARGS: +
......@@ -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
......@@ -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()
......
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