From 88c26105624716bf869174cb27e09d6c2a1699ef Mon Sep 17 00:00:00 2001
From: Lars Bilke <lars.bilke@ufz.de>
Date: Fri, 20 Nov 2015 11:03:40 +0100
Subject: [PATCH] Fixed local VTK build.
---
scripts/cmake/ExternalProjectCatalyst.cmake | 2 +-
scripts/cmake/ExternalProjectVtk.cmake | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/scripts/cmake/ExternalProjectCatalyst.cmake b/scripts/cmake/ExternalProjectCatalyst.cmake
index b754b022e28..fbb45925300 100644
--- a/scripts/cmake/ExternalProjectCatalyst.cmake
+++ b/scripts/cmake/ExternalProjectCatalyst.cmake
@@ -64,7 +64,7 @@ ExternalProject_Add(Catalyst
INSTALL_COMMAND ""
)
-if(NOT ${ParaView_FOUND})
+if(NOT ParaView_FOUND)
# Rerun cmake in initial build
add_custom_target(VtkRescan ${CMAKE_COMMAND} ${CMAKE_SOURCE_DIR} DEPENDS Catalyst)
else()
diff --git a/scripts/cmake/ExternalProjectVtk.cmake b/scripts/cmake/ExternalProjectVtk.cmake
index 4f7d33ab1a4..80823ecc54b 100644
--- a/scripts/cmake/ExternalProjectVtk.cmake
+++ b/scripts/cmake/ExternalProjectVtk.cmake
@@ -14,7 +14,7 @@ endif()
if(OGS_LIB_VTK STREQUAL "System")
find_package(VTK 6.1 COMPONENTS ${VTK_MODULES} NO_MODULE REQUIRED)
-elseif(OGS_LIB_VTK STREQUAL "Default")
+elseif(OGS_LIB_VTK STREQUAL "Default" OR DEFINED VTK_DIR)
find_package(VTK 6.1 COMPONENTS ${VTK_MODULES} NO_MODULE QUIET)
endif()
@@ -61,7 +61,7 @@ ExternalProject_Add(vtk
INSTALL_COMMAND ""
)
-if(NOT ${VTK_FOUND})
+if(NOT VTK_FOUND)
# Rerun cmake in initial build
add_custom_target(VtkRescan ${CMAKE_COMMAND} ${CMAKE_SOURCE_DIR} DEPENDS vtk)
else()
--
GitLab