diff options
author | Allen Byrne <50328838+byrnHDF@users.noreply.github.com> | 2023-08-23 19:32:09 (GMT) |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-08-23 19:32:09 (GMT) |
commit | e1602a287b0f9520f5e92f65263359b5f04ebce7 (patch) | |
tree | d7468a6e5a9b768bbe946c9f201c265317d2914c /config | |
parent | 81fc47cc06dd162940b39b99b25c3708db026b0a (diff) | |
download | hdf5-e1602a287b0f9520f5e92f65263359b5f04ebce7.zip hdf5-e1602a287b0f9520f5e92f65263359b5f04ebce7.tar.gz hdf5-e1602a287b0f9520f5e92f65263359b5f04ebce7.tar.bz2 |
Re-enable SZIP default to ON in CMake (#3414)
The Autotools were handled in a separate commit
Diffstat (limited to 'config')
-rw-r--r-- | config/cmake/cacheinit.cmake | 4 | ||||
-rw-r--r-- | config/cmake/scripts/HDF5options.cmake | 6 |
2 files changed, 3 insertions, 7 deletions
diff --git a/config/cmake/cacheinit.cmake b/config/cmake/cacheinit.cmake index 9a0d073..ad61584 100644 --- a/config/cmake/cacheinit.cmake +++ b/config/cmake/cacheinit.cmake @@ -32,10 +32,6 @@ set_property (CACHE HDF5_INSTALL_MOD_FORTRAN PROPERTY STRINGS NO SHARED STATIC) set (HDF5_BUILD_GENERATORS ON CACHE BOOL "Build Test Generators" FORCE) -set (HDF5_ENABLE_SZIP_SUPPORT ON CACHE BOOL "Use SZip Filter" FORCE) - -set (HDF5_ENABLE_SZIP_ENCODING ON CACHE BOOL "Use SZip Encoding" FORCE) - set (MPIEXEC_MAX_NUMPROCS "4" CACHE STRING "Minimum number of processes for HDF parallel tests" FORCE) set (HDF5_ENABLE_ALL_WARNINGS ON CACHE BOOL "Enable all warnings" FORCE) diff --git a/config/cmake/scripts/HDF5options.cmake b/config/cmake/scripts/HDF5options.cmake index 5267212..92bfd37 100644 --- a/config/cmake/scripts/HDF5options.cmake +++ b/config/cmake/scripts/HDF5options.cmake @@ -69,9 +69,9 @@ set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ALLOW_EXTERNAL_SUPPORT:STRIN ### disable using ext zlib #set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ENABLE_Z_LIB_SUPPORT:BOOL=OFF") -### enable using ext szip -#set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ENABLE_SZIP_SUPPORT:BOOL=ON") -#set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ENABLE_SZIP_ENCODING:BOOL=ON") +### disable using ext szip +#set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ENABLE_SZIP_SUPPORT:BOOL=OFF") +#set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ENABLE_SZIP_ENCODING:BOOL=OFF") #### package examples #### #set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_PACK_EXAMPLES:BOOL=ON -DHDF5_EXAMPLES_COMPRESSED:STRING=HDF5Examples-2.0.3-Source.tar.gz -DHDF5_EXAMPLES_COMPRESSED_DIR:PATH=${CTEST_SCRIPT_DIRECTORY}") |