Merge pull request #3 from psavery/prebuilt-vtk

Allow prebuilt VTK to be used for building Tomviz

Author: celiafish

.github/workflows/build_requirements.txt

@@ -12,6 +12,8 @@ libzip
 libcurl
 icu
 libharu
+libxml2-devel=2.14*
+vtk==9.5.2
 # This is needed for building the tests
 gtest
 # Next three are Linux only

.github/workflows/scripts/build_paraview.sh

@@ -4,18 +4,15 @@ mkdir -p paraview-build && cd paraview-build
 cmake -G"Ninja" -DCMAKE_BUILD_TYPE:STRING=RelWithDebInfo \
   -DCMAKE_INSTALL_LIBDIR:STRING=lib \
   -DCMAKE_FIND_FRAMEWORK:STRING=LAST \
-  -DBUILD_TESTING:BOOL=OFF \
   -DPython3_FIND_STRATEGY:STRING=LOCATION \
   -DPARAVIEW_ENABLE_CATALYST:BOOL=OFF \
   -DPARAVIEW_USE_PYTHON:BOOL=ON \
+  -DPARAVIEW_BUILD_WITH_EXTERNAL:BOOL=ON \
+  -DPARAVIEW_USE_EXTERNAL_VTK:BOOL=ON \
   -DPARAVIEW_ENABLE_WEB:BOOL=OFF \
-  -DPARAVIEW_ENABLE_EMBEDDED_DOCUMENTATION:BOOL=OFF\
+  -DPARAVIEW_ENABLE_EMBEDDED_DOCUMENTATION:BOOL=OFF \
   -DPARAVIEW_USE_QTHELP:BOOL=OFF \
   -DPARAVIEW_PLUGINS_DEFAULT:BOOL=OFF \
   -DPARAVIEW_USE_VISKORES:BOOL=OFF \
-  -DVTK_SMP_IMPLEMENTATION_TYPE:STRING=TBB \
-  -DVTK_PYTHON_VERSION:STRING=3 \
-  -DVTK_PYTHON_FULL_THREADSAFE:BOOL=ON \
-  -DVTK_NO_PYTHON_THREADS:BOOL=OFF \
   ../paraview
 ninja

.github/workflows/scripts/build_tomviz.sh

@@ -4,6 +4,7 @@ mkdir -p tomviz-build && cd tomviz-build
 cmake -G"Ninja" -DCMAKE_BUILD_TYPE:STRING=RelWithDebInfo \
   -DCMAKE_INSTALL_LIBDIR:STRING=lib \
   -DParaView_DIR:PATH=../paraview-build \
+  -DTOMVIZ_USE_EXTERNAL_VTK:BOOL=ON \
   -DENABLE_TESTING:BOOL=ON \
   -DPython3_FIND_STRATEGY:STRING=LOCATION \
   ../tomviz

CMakeLists.txt

@@ -104,10 +104,18 @@ endif()
 set(tomviz_version
   "${tomviz_version_major}.${tomviz_version_minor}.${tomviz_version_patch}")
 
+option(TOMVIZ_USE_EXTERNAL_VTK "Use an external VTK." OFF)
+mark_as_advanced(TOMVIZ_USE_EXTERNAL_VTK)
+
 # These dependencies are inherited from ParaView.
 find_package(Qt6 REQUIRED COMPONENTS Concurrent Network Widgets Core Core5Compat)
 find_package(ParaView REQUIRED)
 
+if(TOMVIZ_USE_EXTERNAL_VTK)
+  find_package(VTK REQUIRED)
+  add_definitions(-DTOMVIZ_USE_EXTERNAL_VTK)
+endif()
+
 # Use automoc, autouic, and autorcc for our Qt code.
 set(CMAKE_AUTOMOC ON)
 set(CMAKE_AUTOUIC ON)

tomviz/CMakeLists.txt

@@ -755,6 +755,7 @@ target_link_libraries(tomvizlib
 if(WIN32)
   target_link_libraries(tomvizlib PUBLIC Qt6::WinMain)
 endif()
+
 if(APPLE)
   set_target_properties(tomviz
     PROPERTIES

tomviz/pybind11/ctvlib/ctvlib.cxx

@@ -3,10 +3,14 @@
 
 #include "ctvlib.h"
 
+#if TOMVIZ_USE_EXTERNAL_VTK
+#include <Eigen/Core>
+#include <Eigen/SparseCore>
+#else
 #include <vtk_eigen.h>
-
 #include VTK_EIGEN(Core)
 #include VTK_EIGEN(SparseCore)
+#endif
 
 #include <tbb/parallel_for.h>
 #include <tbb/parallel_reduce.h>

tomviz/pybind11/ctvlib/ctvlib.h

@@ -4,10 +4,14 @@
 #ifndef ctvlib_h
 #define ctvlib_h
 
+#if TOMVIZ_USE_EXTERNAL_VTK
+#include <Eigen/Core>
+#include <Eigen/SparseCore>
+#else
 #include <vtk_eigen.h>
-
 #include VTK_EIGEN(Core)
 #include VTK_EIGEN(SparseCore)
+#endif
 
 class ctvlib
 {

tomviz/pybind11/ctvlib/eigenConversion.h

@@ -35,10 +35,14 @@
   disable : 4996) // warning C4996: std::unary_negate is deprecated in C++17
 #endif
 
+#if TOMVIZ_USE_EXTERNAL_VTK
+#include <Eigen/Core>
+#include <Eigen/SparseCore>
+#else
 #include <vtk_eigen.h>
-
 #include VTK_EIGEN(Core)
 #include VTK_EIGEN(SparseCore)
+#endif
 
 // Eigen prior to 3.2.7 doesn't have proper move constructors--but worse, some
 // classes get implicit move constructors that break things.  We could detect