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

Replace MGIS submodule with CPM.

parent af77fe69
No related branches found
No related tags found
No related merge requests found
[submodule "ThirdParty/SwmmInterface"] [submodule "ThirdParty/SwmmInterface"]
path = ThirdParty/SwmmInterface path = ThirdParty/SwmmInterface
url = https://github.com/ufz/SwmmInterface.git url = https://github.com/ufz/SwmmInterface.git
[submodule "ThirdParty/MGIS"]
path = ThirdParty/MGIS
url = https://github.com/ufz/MFrontGenericInterfaceSupport.git
[submodule "ThirdParty/container-maker"] [submodule "ThirdParty/container-maker"]
path = ThirdParty/container-maker path = ThirdParty/container-maker
url = https://gitlab.opengeosys.org/ogs/container-maker.git url = https://gitlab.opengeosys.org/ogs/container-maker.git
......
...@@ -4,8 +4,6 @@ list(APPEND SOURCES MFront.cpp MFront.h) ...@@ -4,8 +4,6 @@ list(APPEND SOURCES MFront.cpp MFront.h)
ogs_add_library(MaterialLib_SolidModels_MFront ${SOURCES}) ogs_add_library(MaterialLib_SolidModels_MFront ${SOURCES})
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH}
"${PROJECT_SOURCE_DIR}/ThirdParty/MGIS")
mfront_behaviours_check_library( mfront_behaviours_check_library(
OgsMFrontBehaviour OgsMFrontBehaviour
BDT BDT
......
# MFrontGenericInterfaceSupport
if (OGS_USE_MFRONT)
set(enable-doxygen-doc OFF CACHE INTERNAL "")
set(enable-fortran-bindings OFF CACHE INTERNAL "")
set(CMAKE_CXX_STANDARD 11)
add_subdirectory(MGIS)
set(CMAKE_CXX_STANDARD 17)
list(APPEND DISABLE_WARNINGS_TARGETS MFrontGenericInterface)
endif()
# VtkFbxConverter # VtkFbxConverter
if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/VtkFbxConverter/CMakeLists.txt if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/VtkFbxConverter/CMakeLists.txt
AND OGS_USE_OPTIONAL_SUBMODULES) AND OGS_USE_OPTIONAL_SUBMODULES)
......
Subproject commit 56c5e35fb571d992714e663c6bf61ad5354ba296
...@@ -109,6 +109,21 @@ if(Eigen3_ADDED) ...@@ -109,6 +109,21 @@ if(Eigen3_ADDED)
target_include_directories(Eigen3::Eigen SYSTEM INTERFACE ${Eigen3_SOURCE_DIR}) target_include_directories(Eigen3::Eigen SYSTEM INTERFACE ${Eigen3_SOURCE_DIR})
endif() endif()
if(OGS_USE_MFRONT)
CPMAddPackage(
NAME MGIS
GITHUB_REPOSITORY ufz/MFrontGenericInterfaceSupport
GIT_TAG 56c5e35fb571d992714e663c6bf61ad5354ba296
OPTIONS
"enable-doxygen-doc OFF"
"enable-fortran-bindings OFF"
)
if(MGIS_ADDED)
set_target_properties(MFrontGenericInterface PROPERTIES CXX_STANDARD 11)
list(APPEND DISABLE_WARNINGS_TARGETS MFrontGenericInterface)
endif()
endif()
# Disable warnings # Disable warnings
foreach(TARGET ${DISABLE_WARNINGS_TARGETS}) foreach(TARGET ${DISABLE_WARNINGS_TARGETS})
target_compile_options(${TARGET} PRIVATE target_compile_options(${TARGET} PRIVATE
......
...@@ -9,9 +9,6 @@ endif() ...@@ -9,9 +9,6 @@ endif()
if(OGS_BUILD_SWMM) if(OGS_BUILD_SWMM)
list(APPEND REQUIRED_SUBMODULES ThirdParty/SwmmInterface) list(APPEND REQUIRED_SUBMODULES ThirdParty/SwmmInterface)
endif() endif()
if (OGS_USE_MFRONT)
list(APPEND REQUIRED_SUBMODULES ThirdParty/MGIS)
endif()
execute_process( execute_process(
COMMAND ${GIT_EXECUTABLE} submodule status COMMAND ${GIT_EXECUTABLE} submodule status
......
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