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 | |
| 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
| -rw-r--r-- | CMakeFilters.cmake | 2 | ||||
| -rw-r--r-- | CMakePresets.json | 3 | ||||
| -rw-r--r-- | config/cmake/cacheinit.cmake | 4 | ||||
| -rw-r--r-- | config/cmake/scripts/HDF5options.cmake | 6 | ||||
| -rw-r--r-- | release_docs/INSTALL_CMake.txt | 2 | ||||
| -rw-r--r-- | release_docs/RELEASE.txt | 3 |
6 files changed, 9 insertions, 11 deletions
diff --git a/CMakeFilters.cmake b/CMakeFilters.cmake index 6573ee3..78f98db 100644 --- a/CMakeFilters.cmake +++ b/CMakeFilters.cmake @@ -131,7 +131,7 @@ endif () #----------------------------------------------------------------------------- # Option for SzLib support #----------------------------------------------------------------------------- -option (HDF5_ENABLE_SZIP_SUPPORT "Use SZip Filter" OFF) +option (HDF5_ENABLE_SZIP_SUPPORT "Use SZip Filter" ON) if (HDF5_ENABLE_SZIP_SUPPORT) option (HDF5_ENABLE_SZIP_ENCODING "Use SZip Encoding" ON) if (NOT SZIP_USE_EXTERNAL) diff --git a/CMakePresets.json b/CMakePresets.json index dcb6ff5..6fe2fd0 100644 --- a/CMakePresets.json +++ b/CMakePresets.json @@ -34,8 +34,7 @@ "cacheVariables": { "HDF5_PACKAGE_EXTLIBS": "ON", "ZLIB_USE_LOCALCONTENT": "OFF", - "LIBAEC_USE_LOCALCONTENT": "OFF", - "HDF5_ENABLE_SZIP_SUPPORT": "ON" + "LIBAEC_USE_LOCALCONTENT": "OFF" } }, { 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}") diff --git a/release_docs/INSTALL_CMake.txt b/release_docs/INSTALL_CMake.txt index 75738ad..f979ff3 100644 --- a/release_docs/INSTALL_CMake.txt +++ b/release_docs/INSTALL_CMake.txt @@ -876,7 +876,7 @@ if (BUILD_TESTING) ---------------- External Library Options --------------------- HDF5_ALLOW_EXTERNAL_SUPPORT "Allow External Library Building (NO GIT TGZ)" "NO" HDF5_ENABLE_PLUGIN_SUPPORT "Enable PLUGIN Filters" OFF -HDF5_ENABLE_SZIP_SUPPORT "Use SZip Filter" OFF +HDF5_ENABLE_SZIP_SUPPORT "Use SZip Filter" ON HDF5_ENABLE_Z_LIB_SUPPORT "Enable Zlib Filters" ON PLUGIN_USE_EXTERNAL "Use External Library Building for PLUGINS" 0 ZLIB_USE_EXTERNAL "Use External Library Building for ZLIB" 0 diff --git a/release_docs/RELEASE.txt b/release_docs/RELEASE.txt index bef7c96..7de4b18 100644 --- a/release_docs/RELEASE.txt +++ b/release_docs/RELEASE.txt @@ -53,6 +53,9 @@ New Features Since libaec is prevalent and BSD-licensed for both encoding and decoding, we build the szip filter by default now. + Both autotools and CMake build systems will process the szip filter the same as + the zlib filter is processed. + - Removed CMake cross-compiling variables * HDF5_USE_PREGEN |