diff --git a/scripts/cmake/ConanSetup.cmake b/scripts/cmake/ConanSetup.cmake index 8870d08c2bc1c718799cb2673bcad951d2555df4..0e6e7ed38b35abb8a111f8f963028810e01ea047 100644 --- a/scripts/cmake/ConanSetup.cmake +++ b/scripts/cmake/ConanSetup.cmake @@ -14,7 +14,6 @@ endif() if(NOT CONAN_CMD AND (OGS_USE_PETSC OR OGS_USE_LIS - OR OGS_USE_MFRONT OR OGS_BUILD_GUI ) ) @@ -50,10 +49,6 @@ if(OGS_USE_LIS) set(CONAN_REQUIRES ${CONAN_REQUIRES} lis/1.7.37@bilke/stable) endif() -if(OGS_USE_MFRONT) - set(CONAN_REQUIRES ${CONAN_REQUIRES} tfel/${ogs.minimum_version.tfel-rliv}@bilke/testing) -endif() - if(OGS_BUILD_GUI) set(QT_VERSION ${ogs.minimum_version.qt}) if(UNIX) diff --git a/scripts/cmake/Dependencies.cmake b/scripts/cmake/Dependencies.cmake index bf99342b6ca71b28803b370ca102695d03ea8a6d..203cb21c3f5f6ea2b6ef5b92a7016d568c8a12ac 100644 --- a/scripts/cmake/Dependencies.cmake +++ b/scripts/cmake/Dependencies.cmake @@ -1,3 +1,16 @@ +include(BuildExternalProject) + +if(OGS_USE_MFRONT) + if(NOT _MFRONT_TFEL_FOUND) + BuildExternalProject( + TFEL GIT_REPOSITORY https://github.com/thelfer/tfel.git GIT_TAG + rliv-${ogs.minimum_version.tfel-rliv} + ) + endif() + set(ENV{TFELHOME} ${PROJECT_BINARY_DIR}/external/build_TFEL) + list(APPEND CMAKE_INSTALL_RPATH $ENV{TFELHOME}/${CMAKE_INSTALL_LIBDIR}) +endif() + set(CMAKE_FOLDER ThirdParty) # ccache @@ -126,6 +139,7 @@ if(OGS_USE_MFRONT) if(MGIS_ADDED) set_target_properties(MFrontGenericInterface PROPERTIES CXX_STANDARD 11) list(APPEND DISABLE_WARNINGS_TARGETS MFrontGenericInterface) + set(_MFRONT_TFEL_FOUND ON CACHE INTERNAL "") endif() endif()