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

[cmake] Only apply mgis patch when CPM_SOURCE_CACHE is defined.

See https://github.com/cpm-cmake/CPM.cmake/issues/577.

Should fix issues observed by various developers.
parent aba27404
No related branches found
No related tags found
No related merge requests found
...@@ -165,15 +165,22 @@ if(OGS_USE_MFRONT) ...@@ -165,15 +165,22 @@ if(OGS_USE_MFRONT)
find_package(MFrontGenericInterface REQUIRED) find_package(MFrontGenericInterface REQUIRED)
else() else()
set(CMAKE_REQUIRE_FIND_PACKAGE_TFEL TRUE) set(CMAKE_REQUIRE_FIND_PACKAGE_TFEL TRUE)
# Patch only works when CPM_SOURCE_CACHE is set. Following conditional
# logic can be removed if
# https://github.com/cpm-cmake/CPM.cmake/issues/577 is resolved.
if(NOT "${CPM_SOURCE_CACHE}" STREQUAL "")
set(_mgis_patch_args
PATCHES ${PROJECT_SOURCE_DIR}/scripts/cmake/mgis-flags.patch
)
message(STATUS "Adding mgis-flags.patch.")
endif()
CPMAddPackage( CPMAddPackage(
NAME MGIS NAME MGIS
GITHUB_REPOSITORY thelfer/MFrontGenericInterfaceSupport GITHUB_REPOSITORY thelfer/MFrontGenericInterfaceSupport
GIT_TAG rliv-2.0 GIT_TAG rliv-2.0
OPTIONS "enable-doxygen-doc OFF" "enable-fortran-bindings OFF" OPTIONS "enable-doxygen-doc OFF" "enable-fortran-bindings OFF"
"enable-website OFF" "enable-website OFF"
EXCLUDE_FROM_ALL EXCLUDE_FROM_ALL YES SYSTEM TRUE ${_mgis_patch_args}
YES SYSTEM TRUE PATCHES
${PROJECT_SOURCE_DIR}/scripts/cmake/mgis-flags.patch
) )
list(APPEND DISABLE_WARNINGS_TARGETS MFrontGenericInterface) list(APPEND DISABLE_WARNINGS_TARGETS MFrontGenericInterface)
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