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

Replaced tetgen submodule with CPM.

parent dfe4662b
No related branches found
No related tags found
No related merge requests found
[submodule "ThirdParty/tetgen"]
path = ThirdParty/tetgen
url = https://github.com/ufz/tetgen.git
[submodule "ThirdParty/metis"] [submodule "ThirdParty/metis"]
path = ThirdParty/metis path = ThirdParty/metis
url = https://github.com/scibuilder/metis.git url = https://github.com/scibuilder/metis.git
......
...@@ -24,13 +24,6 @@ if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/VtkFbxConverter/CMakeLists.txt ...@@ -24,13 +24,6 @@ if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/VtkFbxConverter/CMakeLists.txt
add_subdirectory(VtkFbxConverter) add_subdirectory(VtkFbxConverter)
endif() endif()
# tetgen
if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/tetgen/CMakeLists.txt)
add_subdirectory(tetgen)
list(APPEND DISABLE_WARNINGS_TARGETS tet tetgen)
install(PROGRAMS $<TARGET_FILE:tetgen> DESTINATION bin COMPONENT ogs_extras)
endif()
if(OGS_BUILD_SWMM) if(OGS_BUILD_SWMM)
add_subdirectory(SWMMInterface) add_subdirectory(SWMMInterface)
list(APPEND DISABLE_WARNINGS_TARGETS SWMM SwmmInterface) list(APPEND DISABLE_WARNINGS_TARGETS SWMM SwmmInterface)
......
Subproject commit 603ba181ebfaed38eec88532720e282606009b73
...@@ -29,7 +29,7 @@ if(BUILD_TESTING) ...@@ -29,7 +29,7 @@ if(BUILD_TESTING)
"VTK_LIBRARIES vtkIOXML" "VTK_LIBRARIES vtkIOXML"
) )
if(vtkdiff_ADDED) if(vtkdiff_ADDED)
install(PROGRAMS $<TARGET_FILE:vtkdiff> DESTINATION bin COMPONENT ogs_extras) install(PROGRAMS $<TARGET_FILE:vtkdiff> DESTINATION bin)
endif() endif()
endif() endif()
...@@ -61,6 +61,15 @@ if(tclap_ADDED) ...@@ -61,6 +61,15 @@ if(tclap_ADDED)
target_include_directories(tclap INTERFACE ${tclap_SOURCE_DIR}/include) target_include_directories(tclap INTERFACE ${tclap_SOURCE_DIR}/include)
endif() endif()
CPMAddPackage(
NAME tetgen
GITHUB_REPOSITORY ufz/tetgen
GIT_TAG 603ba181ebfaed38eec88532720e282606009b73
)
if(tetgen_ADDED)
install(PROGRAMS $<TARGET_FILE:tetgen> DESTINATION bin)
endif()
###################### ######################
### Find tools ### ### Find tools ###
###################### ######################
......
...@@ -12,7 +12,6 @@ set(REQUIRED_SUBMODULES ...@@ -12,7 +12,6 @@ set(REQUIRED_SUBMODULES
ThirdParty/cmake-modules ThirdParty/cmake-modules
ThirdParty/iphreeqc/src ThirdParty/iphreeqc/src
ThirdParty/json-cmake ThirdParty/json-cmake
ThirdParty/tetgen
${OGS_ADDITIONAL_SUBMODULES_TO_CHECKOUT} ${OGS_ADDITIONAL_SUBMODULES_TO_CHECKOUT}
) )
if(OGS_USE_XDMF) if(OGS_USE_XDMF)
......
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