summaryrefslogtreecommitdiffstats
path: root/config
diff options
context:
space:
mode:
authorAllen Byrne <50328838+byrnHDF@users.noreply.github.com>2023-08-22 16:04:20 (GMT)
committerGitHub <noreply@github.com>2023-08-22 16:04:20 (GMT)
commita66ba8ff553e5811530898ab70862e6cd5e85b9c (patch)
treed1bb23c16a0cc76a6b7564aeb0a8057d0b584d62 /config
parent83ad24852850ef53ae4ee577fb0feaf55de52195 (diff)
downloadhdf5-a66ba8ff553e5811530898ab70862e6cd5e85b9c.zip
hdf5-a66ba8ff553e5811530898ab70862e6cd5e85b9c.tar.gz
hdf5-a66ba8ff553e5811530898ab70862e6cd5e85b9c.tar.bz2
Update presets, examples uncompress, szip cache (#3392)
* Update presets, examples uncompress, szip cache * remove obsolete file * Correct spelling * Update build script to match change in presets
Diffstat (limited to 'config')
-rw-r--r--config/cmake-presets/hidden-presets.json4
-rw-r--r--config/cmake/ConfigureChecks.cmake2
-rw-r--r--config/cmake/cacheinit.cmake4
-rw-r--r--config/cmake/scripts/HDF5options.cmake4
4 files changed, 9 insertions, 5 deletions
diff --git a/config/cmake-presets/hidden-presets.json b/config/cmake-presets/hidden-presets.json
index 18ffdd1..9dd4f9f 100644
--- a/config/cmake-presets/hidden-presets.json
+++ b/config/cmake-presets/hidden-presets.json
@@ -7,8 +7,8 @@
"description": "Basic build using Ninja generator",
"generator": "Ninja",
"hidden": true,
- "binaryDir": "${sourceParentDir}/build/${presetName}",
- "installDir": "${sourceParentDir}/install/${presetName}"
+ "binaryDir": "${sourceParentDir}/build114/${presetName}",
+ "installDir": "${sourceParentDir}/install114/${presetName}"
},
{
"name": "ci-x64",
diff --git a/config/cmake/ConfigureChecks.cmake b/config/cmake/ConfigureChecks.cmake
index 4da401a..e928a83 100644
--- a/config/cmake/ConfigureChecks.cmake
+++ b/config/cmake/ConfigureChecks.cmake
@@ -916,7 +916,7 @@ endmacro ()
#-----------------------------------------------------------------------------
# ----------------------------------------------------------------------
-# Set the flag to indicate that the machine is using a special algorithm toconvert
+# Set the flag to indicate that the machine is using a special algorithm to convert
# 'long double' to '(unsigned) long' values. (This flag should only be set for
# the IBM Power Linux. When the bit sequence of long double is
# 0x4351ccf385ebc8a0bfcc2a3c3d855620, the converted value of (unsigned)long
diff --git a/config/cmake/cacheinit.cmake b/config/cmake/cacheinit.cmake
index ee2d7c7..a07b8d3 100644
--- a/config/cmake/cacheinit.cmake
+++ b/config/cmake/cacheinit.cmake
@@ -32,6 +32,10 @@ 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 ba5fc24..5267212 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")
-### disable using ext szip
+### 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=OFF")
+#set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ENABLE_SZIP_ENCODING:BOOL=ON")
#### 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}")