From a88c7c5cc47845d5c590623dc4fd8989ecfb6f00 Mon Sep 17 00:00:00 2001
From: Lars Bilke <lars.bilke@ufz.de>
Date: Tue, 7 Oct 2014 12:50:18 +0200
Subject: [PATCH] Added environment variable check for ParaView_DIR.
---
scripts/cmake/ExternalProjectCatalyst.cmake | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/scripts/cmake/ExternalProjectCatalyst.cmake b/scripts/cmake/ExternalProjectCatalyst.cmake
index e13a3f52def..75794420c75 100644
--- a/scripts/cmake/ExternalProjectCatalyst.cmake
+++ b/scripts/cmake/ExternalProjectCatalyst.cmake
@@ -3,6 +3,10 @@ INCLUDE(ExternalProject)
SET(CATALYST_GIT_URL https://github.com/ufz/catalyst-io.git)
+IF(NOT DEFINED ParaView_DIR AND DEFINED ENV{ParaView_DIR})
+ SET(ParaView_DIR $ENV{ParaView_DIR})
+ENDIF()
+
FIND_PACKAGE(ParaView 4.2 COMPONENTS vtkIOXML QUIET)
FIND_LIBRARY(VTKIO_LIB_FOUND vtkIOXML-pv4.2 HINTS ${ParaView_DIR}/lib PATH_SUFFIXES Release Debug)
@@ -10,7 +14,7 @@ IF(ParaView_FOUND AND VTKIO_LIB_FOUND)
INCLUDE("${PARAVIEW_USE_FILE}")
# MESSAGE("Using Catalyst in ${ParaView_FOUND}")
RETURN()
-ELSE()
+ELSEIF(NOT ParaView_DIR)
SET(ParaView_DIR ${CMAKE_BINARY_DIR}/External/catalyst/src/Catalyst-build CACHE PATH "" FORCE)
ENDIF()
@@ -52,4 +56,4 @@ IF(NOT ${ParaView_FOUND})
ELSE()
ADD_CUSTOM_TARGET(VtkRescan) # dummy target for caching
ENDIF()
-
\ No newline at end of file
+
--
GitLab