VisIt: Update to VisIt 3.3.0. (#31654)

This commit is contained in:
Eric Brugger 2022-07-27 13:46:04 -07:00 committed by GitHub
parent a3f8dc1874
commit 71657fffbd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 24 additions and 2 deletions

View file

@ -69,6 +69,7 @@ class Visit(CMakePackage):
executables = ['^visit$']
version('develop', branch='develop')
version('3.3.0', sha256='1a7485146133ac5f1e330d9029697750046ef8d9e9de23a6c2a3685c1c5f4aac')
version('3.2.2', sha256='d19ac24c622a3bc0a71bc9cd6e5c9860e43f39e3279672129278b6ebce8d0ead')
version('3.2.1', sha256='779d59564c63f31fcbfeff24b14ddd6ac941b3bb7d671d31765a770d193f02e8')
version('3.1.1', sha256='0b60ac52fd00aff3cf212a310e36e32e13ae3ca0ddd1ea3f54f75e4d9b6c6cf0')
@ -85,10 +86,11 @@ class Visit(CMakePackage):
variant('python', default=True, description='Enable Python support')
variant('mpi', default=True, description='Enable parallel engine')
patch('spack-changes-3.1.patch', when="@3.1.0:,develop")
patch('spack-changes-3.1.patch', when="@3.1.0:3.2.2")
patch('spack-changes-3.0.1.patch', when="@3.0.1")
patch('nonframework-qwt.patch', when='^qt~framework platform=darwin')
patch('parallel-hdf5.patch', when='+hdf5+mpi')
patch('parallel-hdf5.patch', when='@3.0.1:3.2.2+hdf5+mpi')
patch('parallel-hdf5-3.3.patch', when='@3.3.0:+hdf5+mpi')
# Exactly one of 'gui' or 'osmesa' has to be enabled
conflicts('+gui', when='+osmesa')

View file

@ -0,0 +1,20 @@
diff -u ./src/CMake/FindHDF5.cmake.orig ./src/CMake/FindHDF5.cmake
--- ./src/CMake/FindHDF5.cmake.orig 2022-07-19 10:58:59.764308000 -0700
+++ ./src/CMake/FindHDF5.cmake 2022-07-19 10:59:24.850296000 -0700
@@ -15,7 +15,7 @@
#
#****************************************************************************/
-# Use the HDF5_DIR hint from the config-site .cmake file
+# Use the HDF5_DIR hint from the config-site .cmake file
INCLUDE(${VISIT_SOURCE_DIR}/CMake/SetUpThirdParty.cmake)
@@ -42,6 +42,6 @@
ELSE()
SET_UP_THIRD_PARTY(HDF5 LIBS hdf5)
IF(VISIT_PARALLEL)
- SET_UP_THIRD_PARTY(HDF5_MPI LIBS hdf5_mpi)
+ SET_UP_THIRD_PARTY(HDF5_MPI LIBS hdf5)
ENDIF(VISIT_PARALLEL)
ENDIF()