From d3056e3bc6c551a14ff875d6048449ca5bee14a6 Mon Sep 17 00:00:00 2001
From: Lars Bilke <lars.bilke@ufz.de>
Date: Wed, 9 Aug 2017 16:27:21 +0200
Subject: [PATCH] [CMake] Remove AddVtkDependency.cmake
---
Applications/CLI/CMakeLists.txt | 2 --
Applications/DataExplorer/DataExplorer.cmake | 2 --
.../DataExplorer/DataView/CMakeLists.txt | 2 --
.../DataExplorer/VtkVis/CMakeLists.txt | 2 --
Applications/FileIO/CMakeLists.txt | 2 --
.../Utils/FileConverter/CMakeLists.txt | 7 ------
Applications/Utils/MeshEdit/CMakeLists.txt | 22 ++-----------------
.../PartitionMesh/CMakeLists.txt | 1 -
.../Utils/OGSFileConverter/CMakeLists.txt | 2 --
.../Utils/PostProcessing/CMakeLists.txt | 1 -
.../Utils/SWMMConverter/CMakeLists.txt | 2 --
.../Utils/SimpleMeshCreation/CMakeLists.txt | 1 -
MeshLib/CMakeLists.txt | 2 --
ProcessLib/CMakeLists.txt | 2 --
Tests/CMakeLists.txt | 3 ---
scripts/cmake/AddVtkDependency.cmake | 14 ------------
scripts/cmake/CMakeSetup.cmake | 4 ++--
scripts/cmake/Find.cmake | 12 +++++-----
18 files changed, 11 insertions(+), 72 deletions(-)
delete mode 100644 scripts/cmake/AddVtkDependency.cmake
diff --git a/Applications/CLI/CMakeLists.txt b/Applications/CLI/CMakeLists.txt
index bb2be271453..97cbdd8f4e8 100644
--- a/Applications/CLI/CMakeLists.txt
+++ b/Applications/CLI/CMakeLists.txt
@@ -5,8 +5,6 @@ target_link_libraries(ogs
PRIVATE BaseLib ApplicationsLib NumLib ProcessLib
)
-ADD_VTK_DEPENDENCY(ogs)
-
if(OGS_USE_PETSC)
target_link_libraries(ogs PRIVATE ${PETSC_LIBRARIES})
endif()
diff --git a/Applications/DataExplorer/DataExplorer.cmake b/Applications/DataExplorer/DataExplorer.cmake
index 75916b3f9d6..154a3bc936b 100644
--- a/Applications/DataExplorer/DataExplorer.cmake
+++ b/Applications/DataExplorer/DataExplorer.cmake
@@ -97,8 +97,6 @@ if(VTKFBXCONVERTER_FOUND)
target_link_libraries(DataExplorer ${VTKFBXCONVERTER_LIBRARIES})
endif()
-ADD_VTK_DEPENDENCY(DataExplorer)
-
set_property(TARGET DataExplorer PROPERTY FOLDER "DataExplorer")
if(OGS_USE_PCH)
diff --git a/Applications/DataExplorer/DataView/CMakeLists.txt b/Applications/DataExplorer/DataView/CMakeLists.txt
index 9ec327f0e54..969680d8c4c 100644
--- a/Applications/DataExplorer/DataView/CMakeLists.txt
+++ b/Applications/DataExplorer/DataView/CMakeLists.txt
@@ -139,8 +139,6 @@ target_link_libraries(QtDataView
DataHolderLib logog Qt5::Core Qt5::Gui
)
-ADD_VTK_DEPENDENCY(QtDataView)
-
if(GEOTIFF_FOUND)
target_link_libraries(QtDataView PRIVATE ${GEOTIFF_LIBRARIES})
endif () # GEOTIFF_FOUND
diff --git a/Applications/DataExplorer/VtkVis/CMakeLists.txt b/Applications/DataExplorer/VtkVis/CMakeLists.txt
index b5d1f087d61..2122a15d02b 100644
--- a/Applications/DataExplorer/VtkVis/CMakeLists.txt
+++ b/Applications/DataExplorer/VtkVis/CMakeLists.txt
@@ -128,8 +128,6 @@ add_library(VtkVis
${UIS}
)
-ADD_VTK_DEPENDENCY(VtkVis)
-
if(GEOTIFF_FOUND)
include_directories(${GEOTIFF_INCLUDE_DIRS})
target_link_libraries(VtkVis INTERFACE ${GEOTIFF_LIBRARIES})
diff --git a/Applications/FileIO/CMakeLists.txt b/Applications/FileIO/CMakeLists.txt
index 00b7fadad86..f9cad965c0c 100644
--- a/Applications/FileIO/CMakeLists.txt
+++ b/Applications/FileIO/CMakeLists.txt
@@ -33,8 +33,6 @@ if(OGS_BUILD_SWMM)
target_link_libraries(ApplicationsFileIO PRIVATE SwmmInterface)
endif()
-ADD_VTK_DEPENDENCY(ApplicationsFileIO)
-
if(TARGET Eigen)
add_dependencies(ApplicationsFileIO Eigen)
endif()
diff --git a/Applications/Utils/FileConverter/CMakeLists.txt b/Applications/Utils/FileConverter/CMakeLists.txt
index f466c7239a3..52cb36768e5 100644
--- a/Applications/Utils/FileConverter/CMakeLists.txt
+++ b/Applications/Utils/FileConverter/CMakeLists.txt
@@ -8,7 +8,6 @@ if (Qt5XmlPatterns_FOUND)
add_executable(FEFLOW2OGS FEFLOW2OGS.cpp)
set_target_properties(FEFLOW2OGS PROPERTIES FOLDER Utilities)
target_link_libraries(FEFLOW2OGS ApplicationsFileIO)
- ADD_VTK_DEPENDENCY(FEFLOW2OGS)
endif ()
add_executable(convertGEO convertGEO.cpp)
@@ -17,34 +16,28 @@ target_link_libraries(convertGEO GeoLib ApplicationsFileIO)
add_executable(generateMatPropsFromMatID generateMatPropsFromMatID.cpp )
target_link_libraries(generateMatPropsFromMatID MeshLib)
-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 ApplicationsFileIO)
-ADD_VTK_DEPENDENCY(GMSH2OGS)
add_executable(OGS2VTK OGS2VTK.cpp)
set_target_properties(OGS2VTK PROPERTIES FOLDER Utilities)
target_link_libraries(OGS2VTK MeshLib)
-ADD_VTK_DEPENDENCY(OGS2VTK)
add_executable(VTK2OGS VTK2OGS.cpp)
set_target_properties(VTK2OGS PROPERTIES FOLDER Utilities)
target_link_libraries(VTK2OGS MeshLib)
-ADD_VTK_DEPENDENCY(VTK2OGS)
add_executable(VTK2TIN VTK2TIN.cpp)
set_target_properties(VTK2TIN PROPERTIES FOLDER Utilities)
target_link_libraries(VTK2TIN MeshLib)
-ADD_VTK_DEPENDENCY(VTK2TIN)
add_executable(TIN2VTK TIN2VTK.cpp)
set_target_properties(TIN2VTK PROPERTIES FOLDER Utilities)
target_link_libraries(TIN2VTK MeshLib)
-ADD_VTK_DEPENDENCY(TIN2VTK)
####################
### Installation ###
diff --git a/Applications/Utils/MeshEdit/CMakeLists.txt b/Applications/Utils/MeshEdit/CMakeLists.txt
index ebda53b7151..4142d3d7e5d 100644
--- a/Applications/Utils/MeshEdit/CMakeLists.txt
+++ b/Applications/Utils/MeshEdit/CMakeLists.txt
@@ -1,52 +1,39 @@
add_executable(moveMeshNodes moveMeshNodes.cpp)
target_link_libraries(moveMeshNodes MeshLib)
-ADD_VTK_DEPENDENCY(moveMeshNodes)
set_target_properties(moveMeshNodes PROPERTIES FOLDER Utilities)
add_executable(MapGeometryToMeshSurface
MapGeometryToMeshSurface.cpp )
target_link_libraries(MapGeometryToMeshSurface MeshGeoToolsLib MeshLib)
-ADD_VTK_DEPENDENCY(MapGeometryToMeshSurface)
set_target_properties(MapGeometryToMeshSurface PROPERTIES FOLDER Utilities)
add_executable(removeMeshElements removeMeshElements.cpp)
target_link_libraries(removeMeshElements MeshLib)
-ADD_VTK_DEPENDENCY(removeMeshElements)
set_target_properties(removeMeshElements PROPERTIES FOLDER Utilities)
add_executable(NodeReordering NodeReordering.cpp)
target_link_libraries(NodeReordering MeshLib)
-ADD_VTK_DEPENDENCY(NodeReordering)
set_target_properties(NodeReordering PROPERTIES FOLDER Utilities)
add_executable(MoveMesh MoveMesh.cpp)
target_link_libraries(MoveMesh MeshLib)
-ADD_VTK_DEPENDENCY(MoveMesh)
set_target_properties(MoveMesh PROPERTIES FOLDER Utilities)
add_executable(appendLinesAlongPolyline appendLinesAlongPolyline.cpp)
-target_link_libraries(appendLinesAlongPolyline
- MeshGeoToolsLib
- MeshLib
- ApplicationsFileIO
-)
-ADD_VTK_DEPENDENCY(appendLinesAlongPolyline)
+target_link_libraries(appendLinesAlongPolyline MeshGeoToolsLib MeshLib)
set_target_properties(appendLinesAlongPolyline PROPERTIES FOLDER Utilities)
add_executable(editMaterialID editMaterialID.cpp)
target_link_libraries(editMaterialID MeshLib)
-ADD_VTK_DEPENDENCY(editMaterialID)
set_target_properties(editMaterialID PROPERTIES FOLDER Utilities)
add_executable(checkMesh checkMesh.cpp)
target_link_libraries(checkMesh MeshLib)
-ADD_VTK_DEPENDENCY(checkMesh)
set_target_properties(checkMesh PROPERTIES FOLDER Utilities)
add_executable(reviseMesh reviseMesh.cpp)
target_link_libraries (reviseMesh MeshLib)
-ADD_VTK_DEPENDENCY(reviseMesh)
set_target_properties(reviseMesh PROPERTIES FOLDER Utilities)
add_executable(ResetPropertiesInPolygonalRegion
@@ -71,12 +58,7 @@ set_target_properties(createLayeredMeshFromRasters PROPERTIES FOLDER Utilities)
add_executable(CreateBoundaryConditionsAlongPolylines
CreateBoundaryConditionsAlongPolylines.cpp )
-target_link_libraries(CreateBoundaryConditionsAlongPolylines
- MeshGeoToolsLib
- MeshLib
- ApplicationsFileIO
-)
-ADD_VTK_DEPENDENCY(CreateBoundaryConditionsAlongPolylines)
+target_link_libraries(CreateBoundaryConditionsAlongPolylines MeshGeoToolsLib MeshLib)
set_target_properties(CreateBoundaryConditionsAlongPolylines
PROPERTIES FOLDER Utilities)
diff --git a/Applications/Utils/ModelPreparation/PartitionMesh/CMakeLists.txt b/Applications/Utils/ModelPreparation/PartitionMesh/CMakeLists.txt
index 9ea8124236c..b331c0db931 100644
--- a/Applications/Utils/ModelPreparation/PartitionMesh/CMakeLists.txt
+++ b/Applications/Utils/ModelPreparation/PartitionMesh/CMakeLists.txt
@@ -1,7 +1,6 @@
add_executable(partmesh PartitionMesh.cpp NodeWiseMeshPartitioner.h NodeWiseMeshPartitioner.cpp)
set_target_properties(partmesh PROPERTIES FOLDER Utilities)
target_link_libraries(partmesh MeshLib)
-ADD_VTK_DEPENDENCY(partmesh)
####################
### Installation ###
diff --git a/Applications/Utils/OGSFileConverter/CMakeLists.txt b/Applications/Utils/OGSFileConverter/CMakeLists.txt
index 3cf643d8d9e..13c0c664e62 100644
--- a/Applications/Utils/OGSFileConverter/CMakeLists.txt
+++ b/Applications/Utils/OGSFileConverter/CMakeLists.txt
@@ -23,7 +23,6 @@ target_link_libraries(OGSFileConverterLib
PUBLIC QtBase MathLib
INTERFACE MeshLib ApplicationsFileIO
)
-ADD_VTK_DEPENDENCY(OGSFileConverterLib)
add_executable(OGSFileConverter main.cpp)
@@ -31,7 +30,6 @@ target_link_libraries(OGSFileConverter
OGSFileConverterLib
ApplicationsFileIO
)
-ADD_VTK_DEPENDENCY(OGSFileConverter)
set_property(TARGET OGSFileConverter PROPERTY FOLDER "Utilities")
diff --git a/Applications/Utils/PostProcessing/CMakeLists.txt b/Applications/Utils/PostProcessing/CMakeLists.txt
index 14d07062440..f93930ff179 100644
--- a/Applications/Utils/PostProcessing/CMakeLists.txt
+++ b/Applications/Utils/PostProcessing/CMakeLists.txt
@@ -1,7 +1,6 @@
add_executable(postLIE postLIE.cpp)
target_link_libraries(postLIE MeshLib ProcessLib)
-ADD_VTK_DEPENDENCY(postLIE)
set_target_properties(postLIE PROPERTIES FOLDER Utilities)
####################
diff --git a/Applications/Utils/SWMMConverter/CMakeLists.txt b/Applications/Utils/SWMMConverter/CMakeLists.txt
index 3e95aef7be8..2e2fbb3b303 100644
--- a/Applications/Utils/SWMMConverter/CMakeLists.txt
+++ b/Applications/Utils/SWMMConverter/CMakeLists.txt
@@ -11,8 +11,6 @@ target_link_libraries(SWMMConverter
include_directories( ${PROJECT_SOURCE_DIR}/Applications/FileIO )
-ADD_VTK_DEPENDENCY(SWMMConverter)
-
set_target_properties(SWMMConverter PROPERTIES FOLDER Utilities)
install(TARGETS SWMMConverter RUNTIME DESTINATION bin COMPONENT Utilities)
diff --git a/Applications/Utils/SimpleMeshCreation/CMakeLists.txt b/Applications/Utils/SimpleMeshCreation/CMakeLists.txt
index 9792f3b516b..52b4d62a649 100644
--- a/Applications/Utils/SimpleMeshCreation/CMakeLists.txt
+++ b/Applications/Utils/SimpleMeshCreation/CMakeLists.txt
@@ -6,7 +6,6 @@ if(OGS_BUILD_GUI)
ApplicationsFileIO
MeshLib
)
- ADD_VTK_DEPENDENCY(createMeshElemPropertiesFromASCRaster)
endif() # OGS_BUILD_GUI (VtkVis-target is existing)
diff --git a/MeshLib/CMakeLists.txt b/MeshLib/CMakeLists.txt
index 2440d1d7a04..cd2dbe180f1 100644
--- a/MeshLib/CMakeLists.txt
+++ b/MeshLib/CMakeLists.txt
@@ -36,8 +36,6 @@ if(OGS_USE_MPI)
)
endif()
-ADD_VTK_DEPENDENCY(MeshLib)
-
if(TARGET Eigen)
add_dependencies(MeshLib Eigen)
endif()
diff --git a/ProcessLib/CMakeLists.txt b/ProcessLib/CMakeLists.txt
index f73380f5ba8..aa8acef9f72 100644
--- a/ProcessLib/CMakeLists.txt
+++ b/ProcessLib/CMakeLists.txt
@@ -34,8 +34,6 @@ target_link_libraries(ProcessLib
PRIVATE MeshGeoToolsLib
)
-ADD_VTK_DEPENDENCY(ProcessLib)
-
if(TARGET Eigen)
add_dependencies(ProcessLib Eigen)
endif()
diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index b41299ccd02..e60187fea84 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -46,7 +46,6 @@ target_link_libraries(testrunner
ProcessLib
Threads::Threads
)
-ADD_VTK_DEPENDENCY(testrunner)
if(OGS_USE_PETSC)
target_link_libraries(testrunner ${PETSC_LIBRARIES})
@@ -74,8 +73,6 @@ if(Qt5XmlPatterns_FOUND)
endif()
endif()
-ADD_VTK_DEPENDENCY(testrunner)
-
if(OGS_USE_PCH)
cotire(testrunner)
endif()
diff --git a/scripts/cmake/AddVtkDependency.cmake b/scripts/cmake/AddVtkDependency.cmake
deleted file mode 100644
index 29677ca931c..00000000000
--- a/scripts/cmake/AddVtkDependency.cmake
+++ /dev/null
@@ -1,14 +0,0 @@
-macro(ADD_VTK_DEPENDENCY target)
- if(ParaView_FOUND)
- include("${PARAVIEW_USE_FILE}")
-
- # see http://stackoverflow.com/questions/18642155
- set_property(TARGET ${target} APPEND PROPERTY COMPILE_DEFINITIONS ${VTK_DEFINITIONS})
- elseif(VTK_FOUND)
- include( ${VTK_USE_FILE} )
- endif()
-
- if(TARGET VtkRescan)
- add_dependencies(${target} VtkRescan)
- endif()
-endmacro()
diff --git a/scripts/cmake/CMakeSetup.cmake b/scripts/cmake/CMakeSetup.cmake
index 8423dec0d92..87dcfe20d49 100644
--- a/scripts/cmake/CMakeSetup.cmake
+++ b/scripts/cmake/CMakeSetup.cmake
@@ -7,7 +7,6 @@ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH}
include(UseBackportedModules)
include(OptionRequires)
include(CppcheckTargets)
-include(AddVtkDependency)
include(ProcessorCount)
ProcessorCount(NUM_PROCESSORS)
@@ -22,7 +21,8 @@ endif()
if(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
message(STATUS "Setting build type to 'Debug' as none was specified.")
set(CMAKE_BUILD_TYPE Debug CACHE STRING "Choose the type of build." FORCE)
- set_property(CACHE CMAKE_BUILD_TYPE PROPERTY STRINGS "Debug" "Release" "MinSizeRel" "RelWithDebInfo")
+ set_property(CACHE CMAKE_BUILD_TYPE PROPERTY STRINGS
+ "Debug" "Release" "MinSizeRel" "RelWithDebInfo")
endif()
# Get the hostname
diff --git a/scripts/cmake/Find.cmake b/scripts/cmake/Find.cmake
index 308ec9320e2..eb70f0c6b67 100644
--- a/scripts/cmake/Find.cmake
+++ b/scripts/cmake/Find.cmake
@@ -4,7 +4,8 @@
# Find doxygen
if(WIN32)
- find_program(DOXYGEN_DOT_EXECUTABLE NAMES dot PATHS "$ENV{ProgramFiles}/Graphviz*/bin")
+ find_program(DOXYGEN_DOT_EXECUTABLE NAMES dot
+ PATHS "$ENV{ProgramFiles}/Graphviz*/bin")
find_package(Doxygen QUIET)
if(DOXYGEN_DOT_PATH)
file(TO_NATIVE_PATH ${DOXYGEN_DOT_PATH} DOXYGEN_DOT_PATH)
@@ -101,7 +102,7 @@ if(OGS_BUILD_GUI)
if(USE_CONAN)
set(Qt5_DIR ${CONAN_QT_ROOT}/lib/cmake/Qt5)
endif()
- find_package( Qt5 5.2 REQUIRED Gui Widgets Xml XmlPatterns)
+ find_package(Qt5 5.2 REQUIRED Gui Widgets Xml XmlPatterns)
cmake_policy(SET CMP0020 NEW)
set(CMAKE_AUTOMOC TRUE)
set(CMAKE_AUTOUIC TRUE)
@@ -138,10 +139,11 @@ endif()
if(OGS_USE_PETSC)
message(STATUS "Configuring for PETSc")
- option(FORCE_PETSC_EXECUTABLE_RUNS "Force CMake to accept a given PETSc configuration" ON)
+ option(FORCE_PETSC_EXECUTABLE_RUNS
+ "Force CMake to accept a given PETSc configuration" ON)
- ##Force CMake to accept a given PETSc configuration in case the failure of MPI tests
- ##This may cause the compilation broken.
+ # Force CMake to accept a given PETSc configuration in case the failure of
+ # MPI tests. This may cause the compilation broken.
if(FORCE_PETSC_EXECUTABLE_RUNS)
set(PETSC_EXECUTABLE_RUNS YES)
endif()
--
GitLab