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

[cmake] Builds tfel via ExternalProject_Add().

- Removes tfel as a Conan dependency
- To discuss: Ignores system-installed tfel
parent 988b1156
No related branches found
No related tags found
No related merge requests found
......@@ -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)
......
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()
......
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