diff options
author | Allen Byrne <50328838+byrnHDF@users.noreply.github.com> | 2022-06-12 04:06:49 (GMT) |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-06-12 04:06:49 (GMT) |
commit | 2a147be72f29bbe5077bdb7b21b74fc5d24f1b44 (patch) | |
tree | a9549d2f2c1ed4f0635f47d334005cbc0ff092b4 /config/cmake | |
parent | 4466a30825eda620a00e5d8fac35ecf765296aad (diff) | |
download | hdf5-2a147be72f29bbe5077bdb7b21b74fc5d24f1b44.zip hdf5-2a147be72f29bbe5077bdb7b21b74fc5d24f1b44.tar.gz hdf5-2a147be72f29bbe5077bdb7b21b74fc5d24f1b44.tar.bz2 |
Hdf5 1 12 sync (#1794)
Diffstat (limited to 'config/cmake')
-rw-r--r-- | config/cmake/HDF5_Examples.cmake.in | 2 | ||||
-rw-r--r-- | config/cmake/HDFCompilerFlags.cmake | 1 | ||||
-rw-r--r-- | config/cmake/libh5cc.in | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/config/cmake/HDF5_Examples.cmake.in b/config/cmake/HDF5_Examples.cmake.in index 40bc204..4e55786 100644 --- a/config/cmake/HDF5_Examples.cmake.in +++ b/config/cmake/HDF5_Examples.cmake.in @@ -77,7 +77,7 @@ set(ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DSITE:STRING=${CTEST_SITE} -DBUILDN #TAR_SOURCE - name of tarfile #if(NOT DEFINED TAR_SOURCE) -# set(CTEST_USE_TAR_SOURCE "HDF5Examples-1.12.9-Source") +# set(CTEST_USE_TAR_SOURCE "HDF5Examples-1.12.10-Source") #endif() ############################################################################################################### diff --git a/config/cmake/HDFCompilerFlags.cmake b/config/cmake/HDFCompilerFlags.cmake index eb43b73..61218dc 100644 --- a/config/cmake/HDFCompilerFlags.cmake +++ b/config/cmake/HDFCompilerFlags.cmake @@ -231,6 +231,7 @@ if (CMAKE_C_COMPILER_ID STREQUAL "GNU") # Append more extra warning flags that only gcc 7.x+ knows about if (NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 7.0) ADD_H5_FLAGS (H5_CFLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/7") + ADD_H5_FLAGS (H5_CFLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/error-7") if (HDF5_ENABLE_DEV_WARNINGS) ADD_H5_FLAGS (H5_CFLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/developer-7") #else () diff --git a/config/cmake/libh5cc.in b/config/cmake/libh5cc.in index f5d8d4c..6d54088 100644 --- a/config/cmake/libh5cc.in +++ b/config/cmake/libh5cc.in @@ -29,7 +29,7 @@ printf 'dir is %s\n' "$dir" # Show the configuration summary of the library recorded in the -# libhdf5.settings file reside in the lib directory. +# libhdf5.settings file residing in the lib directory. showconfigure() { cat $dir/lib/libhdf5.settings |