diff --git a/Applications/CLI/CMakeLists.txt b/Applications/CLI/CMakeLists.txt
index bb2be2714538f099cdf9d337ff910a2a81094696..97cbdd8f4e843da5bf7a37427162537891167cee 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 75916b3f9d6e53163eee3de33d40c4f5ed0b891d..154a3bc936b06be67c63c3517caef6a940b4c10b 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 9ec327f0e54a990ebe2a043e8f1e2e3c6f256751..969680d8c4c99598622d48bc7c2ca13e094e2578 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 b5d1f087d61e6e44154fb53e23e27f15231195ae..2122a15d02bbc68d3395c9a74afa7889437b4c32 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 00b7fadad86ba5a7327503dc416e1891d61a30b3..f9cad965c0cc56fcd41ea51856157b1110b9388a 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 f466c7239a3e9c0a971084700ef8ef2cc2029ce6..52cb36768e583900ad2657dc2776bb8ffa945727 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 ebda53b715190e720bfa74a91cbfae54b9553463..4142d3d7e5d3fc570d089816c1e2b144ddee4129 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 9ea8124236c585530c956a470d9759378623efc9..b331c0db9310b76826aa4d367fc56874c190a6c5 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 3cf643d8d9e9f9a81ba1dcb3e8e3d59217913345..13c0c664e62cf035a662366a287c7f46e62d84a7 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 14d07062440e3ae46756e867026cf02ea55af32d..f93930ff17929979648c268678cc767c1a807518 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 3e95aef7be8ba8327dc4af201be6798dc3efc027..2e2fbb3b303f9eace1d72c866159213ce370b761 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 9792f3b516b117488eb44b79916829e4feb7f155..52b4d62a64941b04e310218565ce92115dd00621 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 2440d1d7a04ad87d7eba5cba1c03736b4c1a8a49..cd2dbe180f12761cc85dbbf1bf45ddea81b71edd 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 f73380f5ba850aac7e4c504efe9028c539be0aae..aa8acef9f7287e25d49f6a699b533136a99b9d1b 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 b41299ccd02d96f4680ae2412b97876d65c5a7cb..e60187fea841dcf305e915c17638f297d5d835a7 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 29677ca931ca5eae6732b85a4e280a27645cac44..0000000000000000000000000000000000000000
--- 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 8423dec0d92d1c2ce29daf0f74b773e797216b4c..87dcfe20d493e5e4d7915fee8c3ed86ac9358800 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 308ec9320e21c9e92432086b794db35b595929bd..eb70f0c6b679b55589cd00b8c867a99b4d706dd6 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()