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

Updated submodule MGIS for proper tfel finding.

Choose the tfel installation for usage in Conan by setting TFELHOME
CMake- or environment variable. Is automatically set when using
Conans tfel-package.
parent d4af3a29
No related branches found
No related tags found
No related merge requests found
......@@ -263,12 +263,6 @@ if(EXISTS ${PROJECT_SOURCE_DIR}/ThirdParty/vtkdiff/CMakeLists.txt AND BUILD_TEST
install(PROGRAMS $<TARGET_FILE:vtkdiff> DESTINATION bin COMPONENT ogs_extras)
endif()
# Correct tfel paths (they seem to be hard-coded to /usr/local/tfel/...)
if(OGS_USE_MFRONT AND OGS_USE_CONAN)
set(TFEL_INCLUDE_PATH "${CONAN_TFEL_ROOT}/include")
set(TFEL_LIBRARY_PATH "${CONAN_TFEL_ROOT}/lib")
endif()
include(scripts/cmake/CheckHeaderCompilation.cmake)
add_subdirectory(Applications)
......
......@@ -6,7 +6,6 @@ ogs_add_library(MaterialLib_SolidModels_MFront ${SOURCES})
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH}
"${PROJECT_SOURCE_DIR}/ThirdParty/MGIS")
include(cmake/modules/tfel)
mfront_behaviours_check_library(
OgsMFrontBehaviour
BDT
......
Subproject commit 04b35f45281d627b9add8795182445e11aa2e1d0
Subproject commit 56c5e35fb571d992714e663c6bf61ad5354ba296
......@@ -91,7 +91,7 @@ if(OGS_USE_MFRONT)
add_definitions(-DHAVE_PTHREADS)
endif()
if(OGS_USE_CONAN)
set(TFEL_INSTALL_PATH ${CONAN_TFEL_ROOT} CACHE INTERNAL "")
set(TFELHOME ${CONAN_TFEL_ROOT} 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