From 8e9f7761d7d19b84f55e01622666deb5d46430a5 Mon Sep 17 00:00:00 2001
From: Lars Bilke <lars.bilke@ufz.de>
Date: Tue, 3 Nov 2015 15:52:07 +0100
Subject: [PATCH] Renamed CMake macro ADD_CATALYST_DEPENDENCY to
ADD_VTK_DEPENDENCY.
---
Applications/ApplicationsLib/CMakeLists.txt | 2 +-
Applications/CLI/CMakeLists.txt | 2 +-
Applications/DataExplorer/DataExplorer.cmake | 3 +--
.../DataExplorer/DataView/CMakeLists.txt | 3 +--
.../DataExplorer/VtkAct/CMakeLists.txt | 3 +--
.../DataExplorer/VtkVis/CMakeLists.txt | 3 +--
.../Utils/FileConverter/CMakeLists.txt | 14 ++++++-------
Applications/Utils/MeshEdit/CMakeLists.txt | 20 +++++++++----------
.../Utils/OGSFileConverter/CMakeLists.txt | 2 +-
.../Utils/SimpleMeshCreation/CMakeLists.txt | 4 ++--
FileIO/CMakeLists.txt | 2 +-
InSituLib/CMakeLists.txt | 3 +--
MeshLib/CMakeLists.txt | 3 +--
ProcessLib/CMakeLists.txt | 2 +-
Tests/CMakeLists.txt | 5 ++---
...ependency.cmake => AddVtkDependency.cmake} | 2 +-
scripts/cmake/CMakeSetup.cmake | 2 +-
17 files changed, 34 insertions(+), 41 deletions(-)
rename scripts/cmake/{AddCatalystDependency.cmake => AddVtkDependency.cmake} (89%)
diff --git a/Applications/ApplicationsLib/CMakeLists.txt b/Applications/ApplicationsLib/CMakeLists.txt
index 8700999b36d..f40adfcdb56 100644
--- a/Applications/ApplicationsLib/CMakeLists.txt
+++ b/Applications/ApplicationsLib/CMakeLists.txt
@@ -12,7 +12,7 @@ target_link_libraries(ApplicationsLib INTERFACE
${CATALYST_LIBRARIES}
logog
)
-ADD_CATALYST_DEPENDENCY(ApplicationsLib)
+ADD_VTK_DEPENDENCY(ApplicationsLib)
if(TARGET Eigen)
add_dependencies(ApplicationsLib Eigen)
diff --git a/Applications/CLI/CMakeLists.txt b/Applications/CLI/CMakeLists.txt
index e9f57b93144..25432ff0db8 100644
--- a/Applications/CLI/CMakeLists.txt
+++ b/Applications/CLI/CMakeLists.txt
@@ -8,7 +8,7 @@ target_link_libraries(ogs
FileIO
)
-ADD_CATALYST_DEPENDENCY(ogs)
+ADD_VTK_DEPENDENCY(ogs)
if(OGS_USE_PETSC)
target_link_libraries(ogs ${PETSC_LIBRARIES})
diff --git a/Applications/DataExplorer/DataExplorer.cmake b/Applications/DataExplorer/DataExplorer.cmake
index f09823f1af8..a7b745094a5 100644
--- a/Applications/DataExplorer/DataExplorer.cmake
+++ b/Applications/DataExplorer/DataExplorer.cmake
@@ -98,8 +98,7 @@ if(VTKFBXCONVERTER_FOUND)
target_link_libraries(DataExplorer ${VTKFBXCONVERTER_LIBRARIES})
endif()
-include(AddCatalystDependency)
-ADD_CATALYST_DEPENDENCY(DataExplorer)
+ADD_VTK_DEPENDENCY(DataExplorer)
set_property(TARGET DataExplorer PROPERTY FOLDER "DataExplorer")
diff --git a/Applications/DataExplorer/DataView/CMakeLists.txt b/Applications/DataExplorer/DataView/CMakeLists.txt
index 2de5c500a8d..4757fff10c3 100644
--- a/Applications/DataExplorer/DataView/CMakeLists.txt
+++ b/Applications/DataExplorer/DataView/CMakeLists.txt
@@ -139,8 +139,7 @@ target_link_libraries(QtDataView INTERFACE
)
add_dependencies(QtDataView QtDiagramView QtStratView)
-include(AddCatalystDependency)
-ADD_CATALYST_DEPENDENCY(QtDataView)
+ADD_VTK_DEPENDENCY(QtDataView)
if(GEOTIFF_FOUND)
target_link_libraries( QtDataView INTERFACE ${GEOTIFF_LIBRARIES} )
diff --git a/Applications/DataExplorer/VtkAct/CMakeLists.txt b/Applications/DataExplorer/VtkAct/CMakeLists.txt
index 1eeb6db75a5..e726edcfe6f 100644
--- a/Applications/DataExplorer/VtkAct/CMakeLists.txt
+++ b/Applications/DataExplorer/VtkAct/CMakeLists.txt
@@ -30,8 +30,7 @@ add_library( VtkAct STATIC
${HEADERS}
)
-include(AddCatalystDependency)
-ADD_CATALYST_DEPENDENCY(VtkAct)
+ADD_VTK_DEPENDENCY(VtkAct)
target_link_libraries( VtkAct PUBLIC Qt4::QtCore )
target_link_libraries( VtkAct INTERFACE ${CATALYST_LIBRARIES} )
diff --git a/Applications/DataExplorer/VtkVis/CMakeLists.txt b/Applications/DataExplorer/VtkVis/CMakeLists.txt
index 3bc53c4e6fe..d7f1940dbe1 100644
--- a/Applications/DataExplorer/VtkVis/CMakeLists.txt
+++ b/Applications/DataExplorer/VtkVis/CMakeLists.txt
@@ -124,8 +124,7 @@ add_library(VtkVis STATIC
${HEADERS}
)
-include(AddCatalystDependency)
-ADD_CATALYST_DEPENDENCY(VtkVis)
+ADD_VTK_DEPENDENCY(VtkVis)
if(GEOTIFF_FOUND)
include_directories(${GEOTIFF_INCLUDE_DIRS})
diff --git a/Applications/Utils/FileConverter/CMakeLists.txt b/Applications/Utils/FileConverter/CMakeLists.txt
index 18616e2e4e6..ec0b9d4c72d 100644
--- a/Applications/Utils/FileConverter/CMakeLists.txt
+++ b/Applications/Utils/FileConverter/CMakeLists.txt
@@ -27,39 +27,39 @@ if (QT4_FOUND)
add_executable(FEFLOW2OGS FEFLOW2OGS.cpp)
set_target_properties(FEFLOW2OGS PROPERTIES FOLDER Utilities)
target_link_libraries(FEFLOW2OGS FileIO)
- ADD_CATALYST_DEPENDENCY(FEFLOW2OGS)
+ ADD_VTK_DEPENDENCY(FEFLOW2OGS)
endif () # QT4_FOUND
add_executable(generateMatPropsFromMatID generateMatPropsFromMatID.cpp )
target_link_libraries(generateMatPropsFromMatID FileIO)
-ADD_CATALYST_DEPENDENCY(generateMatPropsFromMatID)
+ADD_VTK_DEPENDENCY(generateMatPropsFromMatID)
set_target_properties(generateMatPropsFromMatID
PROPERTIES FOLDER Utilities)
add_executable(GMSH2OGS GMSH2OGS.cpp)
set_target_properties(GMSH2OGS PROPERTIES FOLDER Utilities)
target_link_libraries(GMSH2OGS FileIO )
-ADD_CATALYST_DEPENDENCY(GMSH2OGS)
+ADD_VTK_DEPENDENCY(GMSH2OGS)
add_executable(OGS2VTK OGS2VTK.cpp)
set_target_properties(OGS2VTK PROPERTIES FOLDER Utilities)
target_link_libraries(OGS2VTK FileIO)
-ADD_CATALYST_DEPENDENCY(OGS2VTK)
+ADD_VTK_DEPENDENCY(OGS2VTK)
add_executable(VTK2OGS VTK2OGS.cpp)
set_target_properties(VTK2OGS PROPERTIES FOLDER Utilities)
target_link_libraries(VTK2OGS FileIO)
-ADD_CATALYST_DEPENDENCY(VTK2OGS)
+ADD_VTK_DEPENDENCY(VTK2OGS)
add_executable(VTK2TIN VTK2TIN.cpp)
set_target_properties(VTK2TIN PROPERTIES FOLDER Utilities)
target_link_libraries(VTK2TIN FileIO)
-ADD_CATALYST_DEPENDENCY(VTK2TIN)
+ADD_VTK_DEPENDENCY(VTK2TIN)
add_executable(TIN2VTK TIN2VTK.cpp)
set_target_properties(TIN2VTK PROPERTIES FOLDER Utilities)
target_link_libraries(TIN2VTK FileIO)
-ADD_CATALYST_DEPENDENCY(TIN2VTK)
+ADD_VTK_DEPENDENCY(TIN2VTK)
####################
### Installation ###
diff --git a/Applications/Utils/MeshEdit/CMakeLists.txt b/Applications/Utils/MeshEdit/CMakeLists.txt
index 9c3ef323574..55b3739c4cf 100644
--- a/Applications/Utils/MeshEdit/CMakeLists.txt
+++ b/Applications/Utils/MeshEdit/CMakeLists.txt
@@ -13,50 +13,50 @@ if(QT4_FOUND)
add_executable(moveMeshNodes moveMeshNodes.cpp)
target_link_libraries(moveMeshNodes FileIO)
- ADD_CATALYST_DEPENDENCY(moveMeshNodes)
+ ADD_VTK_DEPENDENCY(moveMeshNodes)
set_target_properties(moveMeshNodes PROPERTIES FOLDER Utilities)
add_executable(MapGeometryToMeshSurface
MapGeometryToMeshSurface.cpp )
target_link_libraries(MapGeometryToMeshSurface FileIO MeshGeoToolsLib)
- ADD_CATALYST_DEPENDENCY(MapGeometryToMeshSurface)
+ ADD_VTK_DEPENDENCY(MapGeometryToMeshSurface)
set_target_properties(MapGeometryToMeshSurface PROPERTIES FOLDER Utilities)
endif() # QT4_FOUND
add_executable(removeMeshElements removeMeshElements.cpp)
target_link_libraries(removeMeshElements FileIO)
-ADD_CATALYST_DEPENDENCY(removeMeshElements)
+ADD_VTK_DEPENDENCY(removeMeshElements)
set_target_properties(removeMeshElements PROPERTIES FOLDER Utilities)
add_executable(NodeReordering NodeReordering.cpp)
target_link_libraries(NodeReordering FileIO)
-ADD_CATALYST_DEPENDENCY(NodeReordering)
+ADD_VTK_DEPENDENCY(NodeReordering)
set_target_properties(NodeReordering PROPERTIES FOLDER Utilities)
add_executable(MoveMesh MoveMesh.cpp)
target_link_libraries(MoveMesh FileIO)
-ADD_CATALYST_DEPENDENCY(MoveMesh)
+ADD_VTK_DEPENDENCY(MoveMesh)
set_target_properties(MoveMesh PROPERTIES FOLDER Utilities)
add_executable(appendLinesAlongPolyline appendLinesAlongPolyline.cpp)
target_link_libraries(appendLinesAlongPolyline FileIO MeshGeoToolsLib)
-ADD_CATALYST_DEPENDENCY(appendLinesAlongPolyline)
+ADD_VTK_DEPENDENCY(appendLinesAlongPolyline)
set_target_properties(appendLinesAlongPolyline PROPERTIES FOLDER Utilities)
add_executable(editMaterialID editMaterialID.cpp)
target_link_libraries(editMaterialID FileIO)
-ADD_CATALYST_DEPENDENCY(editMaterialID)
+ADD_VTK_DEPENDENCY(editMaterialID)
set_target_properties(editMaterialID PROPERTIES FOLDER Utilities)
add_executable(checkMesh checkMesh.cpp)
target_link_libraries(checkMesh FileIO)
-ADD_CATALYST_DEPENDENCY(checkMesh)
+ADD_VTK_DEPENDENCY(checkMesh)
set_target_properties(checkMesh PROPERTIES FOLDER Utilities)
add_executable(reviseMesh reviseMesh.cpp)
target_link_libraries (reviseMesh FileIO)
-ADD_CATALYST_DEPENDENCY(reviseMesh)
+ADD_VTK_DEPENDENCY(reviseMesh)
set_target_properties(reviseMesh PROPERTIES FOLDER Utilities)
add_executable(ResetPropertiesInPolygonalRegion
@@ -72,7 +72,7 @@ set_target_properties(AddTopLayer PROPERTIES FOLDER Utilities)
add_executable(CreateBoundaryConditionsAlongPolylines
CreateBoundaryConditionsAlongPolylines.cpp )
target_link_libraries(CreateBoundaryConditionsAlongPolylines FileIO MeshGeoToolsLib)
-ADD_CATALYST_DEPENDENCY(CreateBoundaryConditionsAlongPolylines)
+ADD_VTK_DEPENDENCY(CreateBoundaryConditionsAlongPolylines)
set_target_properties(CreateBoundaryConditionsAlongPolylines
PROPERTIES FOLDER Utilities)
diff --git a/Applications/Utils/OGSFileConverter/CMakeLists.txt b/Applications/Utils/OGSFileConverter/CMakeLists.txt
index 24be26602a6..81f6521b09b 100644
--- a/Applications/Utils/OGSFileConverter/CMakeLists.txt
+++ b/Applications/Utils/OGSFileConverter/CMakeLists.txt
@@ -61,7 +61,7 @@ add_executable(OGSFileConverter
)
target_link_libraries(OGSFileConverter FileIO QtBase)
-ADD_CATALYST_DEPENDENCY(OGSFileConverter)
+ADD_VTK_DEPENDENCY(OGSFileConverter)
# Adds useful macros and variables
# this is needed to correctly link the qt and vtk libraries through target_link_libraries
diff --git a/Applications/Utils/SimpleMeshCreation/CMakeLists.txt b/Applications/Utils/SimpleMeshCreation/CMakeLists.txt
index 8d67ddb55f4..c56396fbdd3 100644
--- a/Applications/Utils/SimpleMeshCreation/CMakeLists.txt
+++ b/Applications/Utils/SimpleMeshCreation/CMakeLists.txt
@@ -14,12 +14,12 @@ if(OGS_BUILD_GUI)
add_executable(generateStructuredQuadMesh generateStructuredQuadMesh.cpp)
set_target_properties(generateStructuredQuadMesh PROPERTIES FOLDER Utils)
target_link_libraries(generateStructuredQuadMesh FileIO)
- ADD_CATALYST_DEPENDENCY(generateStructuredQuadMesh)
+ ADD_VTK_DEPENDENCY(generateStructuredQuadMesh)
add_executable(createMeshElemPropertiesFromASCRaster createMeshElemPropertiesFromASCRaster.cpp)
set_target_properties(createMeshElemPropertiesFromASCRaster PROPERTIES FOLDER Utils)
target_link_libraries(createMeshElemPropertiesFromASCRaster FileIO)
- ADD_CATALYST_DEPENDENCY(createMeshElemPropertiesFromASCRaster)
+ ADD_VTK_DEPENDENCY(createMeshElemPropertiesFromASCRaster)
endif() # OGS_BUILD_GUI (VtkVis-target is existing)
diff --git a/FileIO/CMakeLists.txt b/FileIO/CMakeLists.txt
index f1fd24afff1..de54768cd88 100644
--- a/FileIO/CMakeLists.txt
+++ b/FileIO/CMakeLists.txt
@@ -59,7 +59,7 @@ if(QT4_FOUND)
target_link_libraries(FileIO PUBLIC Qt4::QtXml Qt4::QtXmlPatterns)
endif()
-ADD_CATALYST_DEPENDENCY(FileIO)
+ADD_VTK_DEPENDENCY(FileIO)
if(TARGET Eigen)
add_dependencies(FileIO Eigen)
endif()
diff --git a/InSituLib/CMakeLists.txt b/InSituLib/CMakeLists.txt
index cb0702c9c65..dac9eec1283 100644
--- a/InSituLib/CMakeLists.txt
+++ b/InSituLib/CMakeLists.txt
@@ -11,5 +11,4 @@ add_library(InSituLib
target_link_libraries(InSituLib INTERFACE MeshLib ${CATALYST_LIBRARIES})
-include(AddCatalystDependency)
-ADD_CATALYST_DEPENDENCY(InSituLib)
+ADD_VTK_DEPENDENCY(InSituLib)
diff --git a/MeshLib/CMakeLists.txt b/MeshLib/CMakeLists.txt
index 03f98cbc6d8..bb85e77f5a0 100644
--- a/MeshLib/CMakeLists.txt
+++ b/MeshLib/CMakeLists.txt
@@ -25,8 +25,7 @@ target_link_libraries(MeshLib INTERFACE
logog
)
-include(AddCatalystDependency)
-ADD_CATALYST_DEPENDENCY(MeshLib)
+ADD_VTK_DEPENDENCY(MeshLib)
if(TARGET Eigen)
add_dependencies(MeshLib Eigen)
diff --git a/ProcessLib/CMakeLists.txt b/ProcessLib/CMakeLists.txt
index 9b10f12fcc8..5eb97dc4a87 100644
--- a/ProcessLib/CMakeLists.txt
+++ b/ProcessLib/CMakeLists.txt
@@ -11,7 +11,7 @@ target_link_libraries(ProcessLib INTERFACE
logog
)
-ADD_CATALYST_DEPENDENCY(ProcessLib)
+ADD_VTK_DEPENDENCY(ProcessLib)
if(TARGET Eigen)
add_dependencies(ProcessLib Eigen)
diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index 2b4e23349f6..751115779ba 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -38,7 +38,7 @@ target_link_libraries(testrunner
GTest
Threads::Threads
)
-ADD_CATALYST_DEPENDENCY(testrunner)
+ADD_VTK_DEPENDENCY(testrunner)
if(OGS_USE_PETSC)
target_link_libraries(testrunner ${PETSC_LIBRARIES})
@@ -67,8 +67,7 @@ if(QT4_FOUND)
endif()
endif()
-include(AddCatalystDependency)
-ADD_CATALYST_DEPENDENCY(testrunner)
+ADD_VTK_DEPENDENCY(testrunner)
# Add make-target test which runs the testrunner
# This should override CTest's predefined test-target but it does not
diff --git a/scripts/cmake/AddCatalystDependency.cmake b/scripts/cmake/AddVtkDependency.cmake
similarity index 89%
rename from scripts/cmake/AddCatalystDependency.cmake
rename to scripts/cmake/AddVtkDependency.cmake
index 85c405a9ef6..215ae14a366 100644
--- a/scripts/cmake/AddCatalystDependency.cmake
+++ b/scripts/cmake/AddVtkDependency.cmake
@@ -1,4 +1,4 @@
-macro(ADD_CATALYST_DEPENDENCY target)
+macro(ADD_VTK_DEPENDENCY target)
if(ParaView_FOUND)
include("${PARAVIEW_USE_FILE}")
diff --git a/scripts/cmake/CMakeSetup.cmake b/scripts/cmake/CMakeSetup.cmake
index 7d9ab65b290..921b504031f 100644
--- a/scripts/cmake/CMakeSetup.cmake
+++ b/scripts/cmake/CMakeSetup.cmake
@@ -9,7 +9,7 @@ include(UseBackportedModules)
include(OptionRequires)
include(CppcheckTargets)
include(GetCompilerInfoString)
-include(AddCatalystDependency)
+include(AddVtkDependency)
include(ProcessorCount)
ProcessorCount(NUM_PROCESSORS)
--
GitLab