diff --git a/CMakeLists.txt b/CMakeLists.txt index 5d74fc66b444486aa93603afa3149e8ff476af36..a5280639c188b5d5fed9f7d0cb5eb520cc0bb01b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -263,6 +263,12 @@ 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) diff --git a/scripts/cmake/Find.cmake b/scripts/cmake/Find.cmake index 2a1f6e98496da17d7bd091fce7f6c2355bfbf99e..0af84de763adac8ffe0fde12e27b968cbef35943 100644 --- a/scripts/cmake/Find.cmake +++ b/scripts/cmake/Find.cmake @@ -90,6 +90,9 @@ if(OGS_USE_MFRONT) set(HAVE_PTHREADS TRUE) add_definitions(-DHAVE_PTHREADS) endif() + if(OGS_USE_CONAN) + set(TFEL_INSTALL_PATH ${CONAN_TFEL_ROOT} CACHE INTERNAL "") + endif() endif() # Do not search for libs if this option is set