CMakeLists.txt

@@ -66,7 +66,7 @@ set(qt5_skip_modules
   qtwebchannel
   qtwebengine
   qtwebsockets)
-set(_superbuild_qt5_default_selection "5.12")
+set(_superbuild_qt5_default_selection "5.15")
 set(qt5_ENABLE_SVG ON CACHE INTERNAL "ParaView requires SVG support") # Localisation lib only required for qtwebkit
 
 # Config Boost
@@ -96,7 +96,7 @@ endif()
 
 macro (superbuild_setup_variables)
     include(SuperbuildVersionMacros)
-    set(paraview_default_version "5.9.0")
+    set(paraview_default_version "5.11.0")
     superbuild_set_version_variables(paraview "${paraview_default_version}" "paraview-version.cmake" "version.txt")
     set(paraview_version "${paraview_version_major}.${paraview_version_minor}")
 endmacro ()
@@ -136,6 +136,7 @@ function (superbuild_find_projects var)
     pythongast
     pythonbeniget
     pythonply
+    xz
     )
 
   if (WIN32)

Projects/paraview.cmake

-#Copied from paraview-superbuild/projects/paraview.cmake with minor changes:
-# - Deprecated DPARAVIEW_PYTHON_VERSION
+# Copied from paraview-superbuild/projects/paraview.cmake with minor changes:
 # - Enabled VTK_MODULE_ENABLE_VTK_libproj
+# - Rename las to liblas
 
 set(PARAVIEW_EXTRA_CMAKE_ARGUMENTS ""
   CACHE STRING "Extra arguments to be passed to ParaView when configuring.")
@@ -50,14 +50,14 @@ if (UNIX)
       fontconfig)
   endif ()
   list(APPEND paraviews_platform_dependencies
-    ffmpeg libxml2 freetype mili gmsh
+    cdi ffmpeg libxml2 freetype mili gmsh
     # For cosmotools
     genericio cosmotools)
 endif ()
 
 if (WIN32)
   list(APPEND paraviews_platform_dependencies
-    openvr)
+    openvr zeromq)
 endif ()
 
 if (USE_NONFREE_COMPONENTS AND (WIN32 OR (UNIX AND NOT APPLE)))
@@ -65,10 +65,9 @@ if (USE_NONFREE_COMPONENTS AND (WIN32 OR (UNIX AND NOT APPLE)))
     visrtx)
 endif ()
 
-set(PARAVIEW_USE_PYTHON ${python3_enabled})
+set(paraview_use_python ${python3_enabled})
 if (python3_enabled AND USE_SYSTEM_python3 AND NOT python3_FIND_LIBRARIES)
-  message(FATAL_ERROR "Python3 libraries not found")
-  set(PARAVIEW_USE_PYTHON OFF)
+  set(paraview_use_python OFF)
 endif()
 
 if (expat_enabled)
@@ -87,14 +86,20 @@ endif()
 
 option(PARAVIEW_ENABLE_MOTIONFX "Enable MotionFX reader, if supported on platform" ON)
 mark_as_advanced(PARAVIEW_ENABLE_MOTIONFX)
+if (NOT PARAVIEW_BUILD_EDITION STREQUAL "CANONICAL")
+  set(PARAVIEW_ENABLE_MOTIONFX OFF)
+endif ()
+
+option(PARAVIEW_ENABLE_NODEEDITOR "Enable NodeEditor plugin" ON)
+mark_as_advanced(PARAVIEW_ENABLE_NODEEDITOR)
 
-option(PARAVIEW_ENABLE_VRPLUGIN "Enable VRPlugin" ON)
-mark_as_advanced(PARAVIEW_ENABLE_VRPLUGIN)
+option(PARAVIEW_ENABLE_CAVEInteraction "Enable CAVEInteraction plugin" ON)
+mark_as_advanced(PARAVIEW_ENABLE_CAVEInteraction)
 
 # vrui support is only available on linux
-if (PARAVIEW_ENABLE_VRPLUGIN AND UNIX)
+if (PARAVIEW_ENABLE_CAVEInteraction AND UNIX)
   list(APPEND paraview_extra_cmake_options
-    -DPARAVIEW_PLUGIN_VRPlugin_USE_VRUI:BOOL=ON
+    -DPARAVIEW_PLUGIN_CAVEInteraction_USE_VRUI:BOOL=ON
   )
 endif()
 
@@ -123,12 +128,20 @@ else ()
   set(paraview_build_shared_libs "${BUILD_SHARED_LIBS_paraview}")
 endif ()
 
-get_property(paraview_tbb_supported GLOBAL
-  PROPERTY superbuild_tbb_supported)
-set(paraview_tbb_dependencies)
-if (paraview_tbb_supported)
-  list(APPEND paraview_tbb_dependencies
-    tbb ospray)
+if (PARAVIEW_BUILD_ID)
+  list(APPEND paraview_extra_cmake_options
+    "-DPARAVIEW_BUILD_ID:STRING=${PARAVIEW_BUILD_ID}")
+endif ()
+
+if (openvr_enabled AND zeromq_enabled)
+  set(paraview_vr_collaboration_enabled TRUE)
+else()
+  set(paraview_vr_collaboration_enabled FALSE)
+endif()
+
+if (openvdb_enabled)
+  list(APPEND paraview_extra_cmake_options
+    -DPARAVIEW_RELOCATABLE_INSTALL:BOOL=OFF)
 endif ()
 
 superbuild_add_project(paraview
@@ -136,16 +149,19 @@ superbuild_add_project(paraview
   DEFAULT_ON
   DEPENDS cxx11
   DEPENDS_OPTIONAL
-    adios2 cuda boost fortran gdal hdf5 matplotlib mpi numpy png protobuf
-    python3 qt5 visitbridge zlib silo liblas lookingglass fides #We renamed project las to liblas
+    adios2 catalyst cuda boost eigen fortran gdal hdf5 matplotlib mpi numpy png
+    protobuf python3 qt5 visitbridge zlib silo liblas lookingglass fides pythonmpi4py # We renamed project las to liblas
     xdmf3 vrpn vtkm netcdf
+    openmp
     openpmd
+    openvdb
     nlohmannjson
     paraviewgettingstartedguide
     paraviewtutorialdata paraviewweb
     ${paraview_all_plugins}
     ${paraviews_platform_dependencies}
-    ${paraview_tbb_dependencies}
+    tbb ospray sqlite
+    tiff proj exodus seacas
     ${PARAVIEW_EXTERNAL_PROJECTS}
 
   CMAKE_ARGS
@@ -158,40 +174,53 @@ superbuild_add_project(paraview
     -DPARAVIEW_BUILD_TESTING:BOOL=OFF
     -DPARAVIEW_BUILD_EDITION:STRING=${PARAVIEW_BUILD_EDITION}
     -DPARAVIEW_ENABLE_ADIOS2:BOOL=${adios2_enabled}
+    -DPARAVIEW_ENABLE_CATALYST:BOOL=${catalyst_enabled}
     -DPARAVIEW_ENABLE_COSMOTOOLS:BOOL=${cosmotools_enabled}
     -DPARAVIEW_ENABLE_FFMPEG:BOOL=${ffmpeg_enabled}
     -DPARAVIEW_ENABLE_FIDES:BOOL=${fides_enabled}
     -DPARAVIEW_ENABLE_GDAL:BOOL=${gdal_enabled}
-    -DPARAVIEW_ENABLE_LAS:BOOL=${liblas_enabled} #We renamed project las to liblas
+    -DPARAVIEW_ENABLE_LAS:BOOL=${liblas_enabled} # We renamed project las to liblas
     -DPARAVIEW_ENABLE_LOOKINGGLASS:BOOL=${lookingglass_enabled}
     -DPARAVIEW_ENABLE_MOTIONFX:BOOL=${PARAVIEW_ENABLE_MOTIONFX}
     -DPARAVIEW_ENABLE_VISITBRIDGE:BOOL=${visitbridge_enabled}
     -DPARAVIEW_ENABLE_XDMF3:BOOL=${xdmf3_enabled}
     -DPARAVIEW_INSTALL_DEVELOPMENT_FILES:BOOL=ON
     -DPARAVIEW_PLUGIN_ENABLE_GmshIO:BOOL=${gmsh_enabled}
+    -DPARAVIEW_PLUGIN_ENABLE_NodeEditor:BOOL=${PARAVIEW_ENABLE_NODEEDITOR}
     -DPARAVIEW_PLUGIN_ENABLE_LookingGlass:BOOL=${lookingglass_enabled}
-    -DPARAVIEW_PLUGIN_ENABLE_OpenVR:BOOL=${openvr_enabled}
+    -DPARAVIEW_PLUGIN_ENABLE_XRInterface:BOOL=${openvr_enabled}
     # No netcdftime module in the package.
     -DPARAVIEW_PLUGIN_ENABLE_NetCDFTimeAnnotationPlugin:BOOL=OFF
-    #-DPARAVIEW_PYTHON_VERSION:STRING=${python_version} #Deprecated
+    -DPARAVIEW_PYTHON_VERSION:STRING=3
     -DPARAVIEW_USE_MPI:BOOL=${mpi_enabled}
     -DPARAVIEW_USE_FORTRAN:BOOL=${fortran_enabled}
-    -DPARAVIEW_USE_PYTHON:BOOL=${PARAVIEW_USE_PYTHON}
+    -DPARAVIEW_USE_PYTHON:BOOL=${paraview_use_python}
     -DPARAVIEW_USE_QT:BOOL=${qt5_enabled}
     -DVISIT_BUILD_READER_Mili:BOOL=${mili_enabled}
     -DVISIT_BUILD_READER_Silo:BOOL=${silo_enabled}
     -DVTK_DEFAULT_RENDER_WINDOW_OFFSCREEN:BOOL=${osmesa_enabled}
+    -DVTK_ENABLE_VR_COLLABORATION:BOOL=${paraview_vr_collaboration_enabled}
+    -DVTK_MODULE_USE_EXTERNAL_VTK_eigen=${eigen_enabled}
     -DVTK_MODULE_USE_EXTERNAL_ParaView_protobuf:BOOL=${protobuf_enabled}
+    -DVTK_MODULE_USE_EXTERNAL_VTK_exodus:BOOL=${exodus_enabled}
     -DVTK_MODULE_USE_EXTERNAL_VTK_expat:BOOL=${expat_enabled}
     -DVTK_MODULE_USE_EXTERNAL_VTK_freetype:BOOL=${freetype_enabled}
     -DVTK_MODULE_USE_EXTERNAL_VTK_hdf5:BOOL=${hdf5_enabled}
+    -DVTK_MODULE_USE_EXTERNAL_VTK_libproj:BOOL=${proj_enabled}
     -DVTK_MODULE_USE_EXTERNAL_VTK_libxml2:BOOL=${libxml2_enabled}
+    -DVTK_MODULE_USE_EXTERNAL_VTK_mpi4py:BOOL=${pythonmpi4py_enabled}
     -DVTK_MODULE_USE_EXTERNAL_VTK_netcdf:BOOL=${netcdf_enabled}
     -DVTK_MODULE_USE_EXTERNAL_VTK_png:BOOL=${png_enabled}
+    -DVTK_MODULE_USE_EXTERNAL_VTK_sqlite:BOOL=${sqlite_enabled}
+    -DVTK_MODULE_USE_EXTERNAL_VTK_tiff:BOOL=${tiff_enabled}
     -DVTK_MODULE_USE_EXTERNAL_VTK_zlib:BOOL=${zlib_enabled}
     -DVTK_OPENGL_HAS_EGL:BOOL=${egl_enabled}
     -DVTK_OPENGL_HAS_OSMESA:BOOL=${osmesa_enabled}
     -DVTK_SMP_IMPLEMENTATION_TYPE:STRING=${paraview_smp_backend}
+    -DVTK_SMP_ENABLE_TBB:BOOL=${tbb_enabled}
+    -DVTK_SMP_ENABLE_OPENMP:BOOL=${openmp_enabled}
+    -DVTK_SMP_ENABLE_STDTHREAD:BOOL=ON
+    -DVTK_SMP_ENABLE_SEQUENTIAL:BOOL=ON
     -DVTK_USE_X:BOOL=${paraview_use_x}
 
     # raytracing flags
@@ -204,8 +233,8 @@ superbuild_add_project(paraview
     -DPARAVIEW_PLUGIN_ENABLE_pvNVIDIAIndeX:BOOL=${nvidiaindex_enabled}
 
     # vrpn
-    -DPARAVIEW_PLUGIN_ENABLE_VRPlugin:BOOL=${PARAVIEW_ENABLE_VRPLUGIN}
-    -DPARAVIEW_PLUGIN_VRPlugin_USE_VRPN:BOOL=${vrpn_enabled}
+    -DPARAVIEW_PLUGIN_ENABLE_CAVEInteraction:BOOL=${PARAVIEW_ENABLE_CAVEInteraction}
+    -DPARAVIEW_PLUGIN_CAVEInteraction_USE_VRPN:BOOL=${vrpn_enabled}
 
     # vtkm
     -DPARAVIEW_PLUGIN_ENABLE_VTKmFilters:BOOL=${vtkm_enabled}
@@ -224,28 +253,18 @@ superbuild_add_project(paraview
     # ParFlow
     -DPARAVIEW_PLUGIN_ENABLE_ParFlow:BOOL=${nlohmannjson_enabled}
 
-    ${paraview_extra_cmake_options}
+    # OpenVDB (not in ParaView v5.9.1 but in master)
+    -DPARAVIEW_ENABLE_OPENVDB:BOOL=${openvdb_enabled}
 
-    ${PARAVIEW_EXTRA_CMAKE_ARGUMENTS})
+    # 3Dconnexion SpaceMouse
+    -DPARAVIEW_PLUGIN_ENABLE_SpaceMouseInteractor:BOOL=${threedxwaresdk_enabled}
 
-if (paraview_SOURCE_SELECTION STREQUAL "5.3.0")
-  superbuild_apply_patch(paraview fix-benchmarks
-    "Fix various issues with the shipped benchmark scripts")
-  superbuild_apply_patch(paraview fix-vtkconfig-part1
-    "Fix various issues with the VTKConfig.cmake (Part 1)")
-endif ()
+    # CDI Reader
+    -DPARAVIEW_PLUGIN_ENABLE_CDIReader:BOOL=${cdi_enabled}
 
-if (paraview_SOURCE_SELECTION STREQUAL "5.5.0")
-  superbuild_apply_patch(paraview fix-mpi4py
-    "Fix issue with building VTK's mpi4py")
-endif ()
+    ${paraview_extra_cmake_options}
 
-if (paraview_SOURCE_SELECTION STREQUAL "5.6.0")
-  superbuild_apply_patch(paraview fix-catalyst-adapter-deps
-    "Fix issue with catalyst adapters and dependency search")
-  superbuild_apply_patch(paraview fix-eye-dome-lighting
-    "Fix eye dome lighting in parallel")
-endif ()
+    ${PARAVIEW_EXTRA_CMAKE_ARGUMENTS})
 
 if (WIN32 AND liblas_enabled)
   superbuild_append_flags(cxx_flags "-DBOOST_ALL_NO_LIB" PROJECT_ONLY)

common-superbuild @ 2024e8bf

-Subproject commit 69c10677d176c8f3a37b9781d5d9ac49127c17a4
+Subproject commit 2024e8bfe768e95a13f67665325024775ef73257

versions.cmake

@@ -25,9 +25,9 @@ superbuild_set_revision(pythonqt
   GIT_TAG "lidarview")
 
 superbuild_set_selectable_source(paraview
-  SELECT 5.9.1 DEFAULT
+  SELECT 5.11.0 DEFAULT
     GIT_REPOSITORY "https://gitlab.kitware.com/LidarView/paraview.git"
-    GIT_TAG        "origin/5.9.1CustomForLidarView")
+    GIT_TAG        "origin/5.11.0CustomForLidarView")
 
 if (WIN32)
   superbuild_set_revision(pcap