Skip to content

Commit b0a01ba

Browse files
authored
Merge pull request #1 from CharlesGueunet/add-catalyst-and-adios
Update to VTK 9.2 in preparation for mangling
2 parents 750aac8 + 757eb67 commit b0a01ba

File tree

6 files changed

+6
-25
lines changed

6 files changed

+6
-25
lines changed

CMakeLists.txt

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1072,7 +1072,7 @@ endif()
10721072
################################
10731073
if( ENABLE_VTK )
10741074
set( VTK_DIR "${CMAKE_INSTALL_PREFIX}/vtk" )
1075-
set( VTK_URL "${TPL_MIRROR_DIR}/VTK-9.1.0.tar.gz" )
1075+
set( VTK_URL "${TPL_MIRROR_DIR}/VTK-9.2.5.tar.gz" )
10761076

10771077
message( STATUS "Building VTK found at ${VTK_URL}" )
10781078

@@ -1100,9 +1100,8 @@ endif( ENABLE_MPI )
11001100
PREFIX ${PROJECT_BINARY_DIR}/vtk
11011101
URL ${VTK_URL}
11021102
INSTALL_DIR ${VTK_DIR}
1103-
PATCH_COMMAND patch -p0 < ${TPL_MIRROR_DIR}/VTK-9.1.0-disable_traits.patch
1104-
COMMAND patch -p0 < ${TPL_MIRROR_DIR}/VTK-9.1.0-duplicate-points-fix.patch
1105-
COMMAND patch -p0 < ${TPL_MIRROR_DIR}/VTK-9.1.0-cmake-fix.patch
1103+
PATCH_COMMAND patch -p0 < ${TPL_MIRROR_DIR}/VTK-9.2.5-disable_traits.patch
1104+
COMMAND patch -p0 < ${TPL_MIRROR_DIR}/VTK-9.2.5-cmake-fix.patch
11061105
BUILD_COMMAND ${TPL_BUILD_COMMAND}
11071106
INSTALL_COMMAND "${TPL_INSTALL_COMMAND}"
11081107
CMAKE_GENERATOR ${TPL_GENERATOR}

tplMirror/VTK-9.1.0-duplicate-points-fix.patch

Lines changed: 0 additions & 10 deletions
This file was deleted.

tplMirror/VTK-9.1.0.tar.gz

Lines changed: 0 additions & 3 deletions
This file was deleted.

tplMirror/VTK-9.1.0-cmake-fix.patch renamed to tplMirror/VTK-9.2.5-cmake-fix.patch

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,3 @@
1919
string(APPEND _MPI_${LANG}_LINK_FLAGS ">")
2020
endif ()
2121
set_property(TARGET MPI::MPI_${LANG} PROPERTY INTERFACE_LINK_OPTIONS "${_MPI_${LANG}_LINK_FLAGS}")
22-
@@ -1823,7 +1824,6 @@
23-
find_package_handle_standard_args(MPI
24-
REQUIRED_VARS ${_MPI_REQ_VARS}
25-
VERSION_VAR ${_MPI_MIN_VERSION}
26-
- REASON_FAILURE_MESSAGE "${_MPI_FAIL_REASON}"
27-
HANDLE_COMPONENTS)
28-
29-
#=============================================================================

tplMirror/VTK-9.2.5.tar.gz

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
version https://git-lfs.github.com/spec/v1
2+
oid sha256:128d601baa980e98ee034207974b33fb38d2c98ab9cf4a5756efdb09ed6c0949
3+
size 53807732

0 commit comments

Comments
 (0)