From 59a90cc650a8323ab37dc1129558fe1f179f720c Mon Sep 17 00:00:00 2001 From: Lars Bilke <lars.bilke@ufz.de> Date: Thu, 1 Jul 2021 15:52:19 +0200 Subject: [PATCH] [cmake] Prefer system tfel before local tfel. --- scripts/cmake/Dependencies.cmake | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/scripts/cmake/Dependencies.cmake b/scripts/cmake/Dependencies.cmake index 203cb21c3f5..3fcaecd4cf4 100644 --- a/scripts/cmake/Dependencies.cmake +++ b/scripts/cmake/Dependencies.cmake @@ -1,13 +1,14 @@ include(BuildExternalProject) if(OGS_USE_MFRONT) - if(NOT _MFRONT_TFEL_FOUND) + find_program(MFRONT mfront) + if(NOT MFRONT) BuildExternalProject( TFEL GIT_REPOSITORY https://github.com/thelfer/tfel.git GIT_TAG rliv-${ogs.minimum_version.tfel-rliv} ) + set(ENV{TFELHOME} ${PROJECT_BINARY_DIR}/external/build_TFEL) endif() - set(ENV{TFELHOME} ${PROJECT_BINARY_DIR}/external/build_TFEL) list(APPEND CMAKE_INSTALL_RPATH $ENV{TFELHOME}/${CMAKE_INSTALL_LIBDIR}) endif() -- GitLab