From ce42ba37b76a844e74ac9036e128399c31ece1db Mon Sep 17 00:00:00 2001 From: Lars Bilke <lars.bilke@ufz.de> Date: Mon, 5 Jul 2021 07:12:34 +0000 Subject: [PATCH] [cmake] Fix rpath for mfront / tfel on Ubuntu. --- .cmake-format.yaml | 1 + scripts/cmake/DependenciesExternalProject.cmake | 3 +++ 2 files changed, 4 insertions(+) diff --git a/.cmake-format.yaml b/.cmake-format.yaml index acc977940b1..539192c92ab 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/cmake/DependenciesExternalProject.cmake b/scripts/cmake/DependenciesExternalProject.cmake index a9edd533a34..032ea1b7324 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() -- GitLab