Skip to content

Commit

Permalink
Merge pull request #1 from CharlesGueunet/add-catalyst-and-adios
Browse files Browse the repository at this point in the history
Update to VTK 9.2 in preparation for mangling
  • Loading branch information
julienfausty authored Mar 6, 2023
2 parents 750aac8 + 757eb67 commit b0a01ba
Show file tree
Hide file tree
Showing 6 changed files with 6 additions and 25 deletions.
7 changes: 3 additions & 4 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -1072,7 +1072,7 @@ endif()
################################
if( ENABLE_VTK )
set( VTK_DIR "${CMAKE_INSTALL_PREFIX}/vtk" )
set( VTK_URL "${TPL_MIRROR_DIR}/VTK-9.1.0.tar.gz" )
set( VTK_URL "${TPL_MIRROR_DIR}/VTK-9.2.5.tar.gz" )

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

Expand Down Expand Up @@ -1100,9 +1100,8 @@ endif( ENABLE_MPI )
PREFIX ${PROJECT_BINARY_DIR}/vtk
URL ${VTK_URL}
INSTALL_DIR ${VTK_DIR}
PATCH_COMMAND patch -p0 < ${TPL_MIRROR_DIR}/VTK-9.1.0-disable_traits.patch
COMMAND patch -p0 < ${TPL_MIRROR_DIR}/VTK-9.1.0-duplicate-points-fix.patch
COMMAND patch -p0 < ${TPL_MIRROR_DIR}/VTK-9.1.0-cmake-fix.patch
PATCH_COMMAND patch -p0 < ${TPL_MIRROR_DIR}/VTK-9.2.5-disable_traits.patch
COMMAND patch -p0 < ${TPL_MIRROR_DIR}/VTK-9.2.5-cmake-fix.patch
BUILD_COMMAND ${TPL_BUILD_COMMAND}
INSTALL_COMMAND "${TPL_INSTALL_COMMAND}"
CMAKE_GENERATOR ${TPL_GENERATOR}
Expand Down
10 changes: 0 additions & 10 deletions tplMirror/VTK-9.1.0-duplicate-points-fix.patch

This file was deleted.

3 changes: 0 additions & 3 deletions tplMirror/VTK-9.1.0.tar.gz

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,3 @@
string(APPEND _MPI_${LANG}_LINK_FLAGS ">")
endif ()
set_property(TARGET MPI::MPI_${LANG} PROPERTY INTERFACE_LINK_OPTIONS "${_MPI_${LANG}_LINK_FLAGS}")
@@ -1823,7 +1824,6 @@
find_package_handle_standard_args(MPI
REQUIRED_VARS ${_MPI_REQ_VARS}
VERSION_VAR ${_MPI_MIN_VERSION}
- REASON_FAILURE_MESSAGE "${_MPI_FAIL_REASON}"
HANDLE_COMPONENTS)

#=============================================================================
File renamed without changes.
3 changes: 3 additions & 0 deletions tplMirror/VTK-9.2.5.tar.gz
Git LFS file not shown

0 comments on commit b0a01ba

Please sign in to comment.