From dfe4662b55e5d67d85bee12f2972d1f40b540afc Mon Sep 17 00:00:00 2001
From: Lars Bilke <lars.bilke@ufz.de>
Date: Mon, 8 Feb 2021 21:34:20 +0100
Subject: [PATCH] Replaced vtkdiff submodule with CPM.
---
.gitmodules | 3 ---
CMakeLists.txt | 5 -----
ThirdParty/vtkdiff | 1 -
scripts/cmake/Find.cmake | 12 ++++++++++++
scripts/cmake/SubmoduleSetup.cmake | 3 ---
5 files changed, 12 insertions(+), 12 deletions(-)
delete mode 160000 ThirdParty/vtkdiff
diff --git a/.gitmodules b/.gitmodules
index a3e069e3f64..cea13b515f2 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,9 +1,6 @@
[submodule "ThirdParty/tetgen"]
path = ThirdParty/tetgen
url = https://github.com/ufz/tetgen.git
-[submodule "vtkdiff"]
- path = ThirdParty/vtkdiff
- url = https://github.com/ufz/vtkdiff.git
[submodule "ThirdParty/metis"]
path = ThirdParty/metis
url = https://github.com/scibuilder/metis.git
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 72503191ce9..98f3a8a494f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -226,11 +226,6 @@ include_directories(
${CMAKE_CURRENT_SOURCE_DIR}/ThirdParty/json/include
)
-# vtkdiff
-if(BUILD_TESTING)
- add_subdirectory(ThirdParty/vtkdiff)
- install(PROGRAMS $<TARGET_FILE:vtkdiff> DESTINATION bin COMPONENT ogs_extras)
-endif()
# xdmfdiff
if(OGS_USE_XDMF AND BUILD_TESTING)
add_subdirectory(Tests/xdmfdiff)
diff --git a/ThirdParty/vtkdiff b/ThirdParty/vtkdiff
deleted file mode 160000
index 49403cee266..00000000000
--- a/ThirdParty/vtkdiff
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 49403cee266bb8e80405a02d677dbb5f71afc61a
diff --git a/scripts/cmake/Find.cmake b/scripts/cmake/Find.cmake
index a1cd935fa30..5769f70e621 100644
--- a/scripts/cmake/Find.cmake
+++ b/scripts/cmake/Find.cmake
@@ -9,6 +9,7 @@ if(BUILD_TESTING)
"INSTALL_GTEST OFF"
"gtest_force_shared_crt ON"
)
+
CPMAddPackage(
NAME autocheck
GITHUB_REPOSITORY ufz/autocheck
@@ -19,6 +20,17 @@ if(BUILD_TESTING)
add_library(autocheck INTERFACE IMPORTED)
target_include_directories(autocheck INTERFACE ${autocheck_SOURCE_DIR}/include)
endif()
+
+ CPMAddPackage(
+ NAME vtkdiff
+ GITHUB_REPOSITORY ufz/vtkdiff
+ GIT_TAG 49403cee266bb8e80405a02d677dbb5f71afc61a
+ OPTIONS
+ "VTK_LIBRARIES vtkIOXML"
+ )
+ if(vtkdiff_ADDED)
+ install(PROGRAMS $<TARGET_FILE:vtkdiff> DESTINATION bin COMPONENT ogs_extras)
+ endif()
endif()
CPMAddPackage(
diff --git a/scripts/cmake/SubmoduleSetup.cmake b/scripts/cmake/SubmoduleSetup.cmake
index dbfa1f68185..585528f06cf 100644
--- a/scripts/cmake/SubmoduleSetup.cmake
+++ b/scripts/cmake/SubmoduleSetup.cmake
@@ -18,9 +18,6 @@ set(REQUIRED_SUBMODULES
if(OGS_USE_XDMF)
list(APPEND REQUIRED_SUBMODULES ThirdParty/xdmf)
endif()
-if(BUILD_TESTING)
- list(APPEND REQUIRED_SUBMODULES ThirdParty/vtkdiff)
-endif()
if(OGS_BUILD_UTILS)
# Required by the partmesh tool, which is build with utils only.
list(APPEND REQUIRED_SUBMODULES ThirdParty/metis)
--
GitLab