From 6790605182acc3c44ae610efcc939c8e4cc8c19d Mon Sep 17 00:00:00 2001
From: Lars Bilke <lars.bilke@ufz.de>
Date: Tue, 28 Feb 2017 09:10:16 +0100
Subject: [PATCH] [CMake] Update usage of Catalyst (VTK Insitu).
---
CMakeLists.txt | 1 +
scripts/cmake/ExternalProjectCatalyst.cmake | 8 +++-----
scripts/cmake/VtkModules.cmake | 4 ++++
3 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 616c4d2b2b3..c344513177d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -212,6 +212,7 @@ include(scripts/cmake/ExternalProjectBoost.cmake)
include(VtkModules)
if(OGS_INSITU)
include(ExternalProjectCatalyst)
+ include("${PARAVIEW_USE_FILE}")
else()
include(ExternalProjectVtk)
endif()
diff --git a/scripts/cmake/ExternalProjectCatalyst.cmake b/scripts/cmake/ExternalProjectCatalyst.cmake
index 5467d041d5f..17227dbec9c 100644
--- a/scripts/cmake/ExternalProjectCatalyst.cmake
+++ b/scripts/cmake/ExternalProjectCatalyst.cmake
@@ -14,10 +14,9 @@ if(OGS_BUILD_GUI)
list(APPEND VTK_LIBRARIES vtkNetCDF vtkNetCDF_cxx)
endif()
-find_package(ParaView 4.2 COMPONENTS ${VTK_MODULES} NO_MODULE QUIET)
+find_package(ParaView 4.2 REQUIRED COMPONENTS ${VTK_MODULES})
-find_library(VTKIO_LIB_FOUND vtkIOXML-pv4.2 HINTS ${ParaView_DIR}/lib PATH_SUFFIXES Release Debug)
-if(ParaView_FOUND AND VTKIO_LIB_FOUND)
+if(ParaView_FOUND)
foreach(DIR ${PARAVIEW_INCLUDE_DIRS})
if("${DIR}" MATCHES ".*vtknetcdf.*")
include_directories(SYSTEM ${DIR}/../cxx ${DIR}/include)
@@ -25,7 +24,7 @@ if(ParaView_FOUND AND VTKIO_LIB_FOUND)
endforeach()
message(STATUS "Using ParaView in ${ParaView_DIR}")
return()
-elseif(NOT ParaView_DIR)
+elseif()
# If nothing was found build ParaView as an external project
set(ParaView_DIR ${CMAKE_BINARY_DIR}/External/catalyst/src/Catalyst-build CACHE PATH "" FORCE)
endif()
@@ -70,4 +69,3 @@ if(NOT ParaView_FOUND)
else()
add_custom_target(VtkRescan) # dummy target for caching
endif()
-
diff --git a/scripts/cmake/VtkModules.cmake b/scripts/cmake/VtkModules.cmake
index b660f64ae18..84cfc78fbac 100644
--- a/scripts/cmake/VtkModules.cmake
+++ b/scripts/cmake/VtkModules.cmake
@@ -27,3 +27,7 @@ if(OGS_BUILD_GUI)
vtkRenderingFreeType
)
endif()
+
+if(OGS_INSITU)
+ set(VTK_MODULES ${VTK_MODULES} vtkPVPythonCatalyst)
+endif()
--
GitLab