diff --git a/scripts/cmake/DependenciesExternalProject.cmake b/scripts/cmake/DependenciesExternalProject.cmake index 3eb0f15f6718f293dc87ed06de0b4fae228b699b..0b5a7126606f08200766220f05f03f5ff76338fb 100644 --- a/scripts/cmake/DependenciesExternalProject.cmake +++ b/scripts/cmake/DependenciesExternalProject.cmake @@ -12,9 +12,9 @@ if(OGS_USE_MFRONT) -DCMAKE_INSTALL_RPATH=<INSTALL_DIR>/lib -DCMAKE_INSTALL_RPATH_USE_LINK_PATH=TRUE ) - set(ENV{TFELHOME} ${PROJECT_BINARY_DIR}/_ext/TFEL) + set(TFELHOME ${PROJECT_BINARY_DIR}/_ext/TFEL CACHE PATH "") endif() - list(APPEND CMAKE_INSTALL_RPATH $ENV{TFELHOME}/${CMAKE_INSTALL_LIBDIR}) + list(APPEND CMAKE_INSTALL_RPATH ${TFELHOME}/lib) endif() if(OGS_USE_PETSC) diff --git a/scripts/cmake/ProjectSetup.cmake b/scripts/cmake/ProjectSetup.cmake index 06d3bdc273e552ff58af3c1a9c5327586891c65d..7090f1cef98d061891900331caeb60b0e031353a 100644 --- a/scripts/cmake/ProjectSetup.cmake +++ b/scripts/cmake/ProjectSetup.cmake @@ -39,5 +39,5 @@ endif() file(RELATIVE_PATH relDir ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_INSTALL_BINDIR} ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_INSTALL_LIBDIR} ) -set(CMAKE_INSTALL_RPATH ${BASEPOINT} ${BASEPOINT}/${relDir}) +list(APPEND CMAKE_INSTALL_RPATH ${BASEPOINT} ${BASEPOINT}/${relDir}) set(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE)