Commit 9626ecfb authored by Dmitry Yu. Naumov's avatar Dmitry Yu. Naumov

Merge branch 'mfront-conan-fix' into 'master'

[CMake] Enforce conan supplied mfront.

Closes #3034

See merge request !3113
parents ff05f401 fcdeb666
Pipeline #1429 passed with stages
in 82 minutes and 51 seconds
......@@ -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)
......
......@@ -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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment