From e22a3868e62a790d4ef2747c782b016088f4161f Mon Sep 17 00:00:00 2001 From: Aron Helser Date: Wed, 28 Jun 2023 13:09:27 -0400 Subject: [PATCH] Bump vtkonly to current release, remove unneeded py3 version set --- projects/vtkonly.cmake | 8 -------- versions.cmake | 4 ++-- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/projects/vtkonly.cmake b/projects/vtkonly.cmake index 8c325ee0..9ed44f8e 100644 --- a/projects/vtkonly.cmake +++ b/projects/vtkonly.cmake @@ -60,8 +60,6 @@ superbuild_add_project(vtkonly -DBUILD_SHARED_LIBS:BOOL=ON -DVTK_BUILD_TESTING:BOOL=OFF -DVTK_WRAP_PYTHON:BOOL=${python3_enabled} - # Remove when vtk/CMake/vtkWrapSettings.cmake no longer defaults to 2 - -DVTK_PYTHON_VERSION:STRING=3 -DVTK_ENABLE_KITS:BOOL=ON -DVTK_UNIFIED_INSTALL_TREE:BOOL=ON @@ -99,11 +97,5 @@ superbuild_add_project(vtkonly ${vtk_extra_cmake_options} ${VTKONLY_EXTRA_CMAKE_ARGUMENTS}) -if (vtkonly_SOURCE_SELECTION STREQUAL "release") - # XXX(vtk-9.0) - superbuild_apply_patch(vtkonly missing-includes - "Fix missing includes with newer compilers") -endif () - superbuild_add_extra_cmake_args( -DVTK_DIR:PATH=/lib/cmake/vtk-${vtk_version}) diff --git a/versions.cmake b/versions.cmake index 52c7afc9..fcdf3f0c 100644 --- a/versions.cmake +++ b/versions.cmake @@ -54,8 +54,8 @@ superbuild_set_selectable_source(paraview superbuild_set_selectable_source(vtkonly # VTK v9.0.2 SELECT release PROMOTE DEFAULT - URL "https://www.vtk.org/files/release/9.0/VTK-9.0.2.tar.gz" - URL_MD5 "1a2d280cd4377d551c3d013209e9d9ed" + URL "https://www.vtk.org/files/release/9.2/VTK-9.2.6.tar.gz" + URL_HASH SHA256=06fc8d49c4e56f498c40fcb38a563ed8d4ec31358d0101e8988f0bb4d539dd12 SELECT git CUSTOMIZABLE GIT_REPOSITORY "https://gitlab.kitware.com/vtk/vtk.git" GIT_TAG "origin/master" -- GitLab