diff --git a/.github/workflows/cygwin-cmake.yml b/.github/workflows/cygwin-cmake.yml index 1ed79dd36f2..70e454bee66 100644 --- a/.github/workflows/cygwin-cmake.yml +++ b/.github/workflows/cygwin-cmake.yml @@ -93,7 +93,7 @@ jobs: set (GROUP "GHDaily") set (SITE_BUILDNAME_SUFFIX "${{ steps.set-file-base.outputs.FILE_BASE }}") set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} --log-level=VERBOSE") - set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_GENERATE_HEADERS=OFF") + set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_GENERATE_HEADERS:BOOL=OFF") set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_BUILD_JAVA:BOOL=OFF") set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_BUILD_CPP_LIB:BOOL=OFF") set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_BUILD_FORTRAN:BOOL=OFF") @@ -109,7 +109,7 @@ jobs: run: | export PATH=/usr/bin:$PATH cd "${{ runner.workspace }}/hdf5" - ctest -S HDF5config.cmake,CTEST_SITE_EXT=GH-CYG,LOCAL_SUBMIT=ON,NINJA=TRUE,BUILD_GENERATOR=Unix,CTEST_SOURCE_NAME=${{ steps.set-file-base.outputs.SOURCE_BASE }} -C Release -VV -O hdf5.log + ctest -S HDF5config.cmake,CTEST_SITE_EXT=GH-${{ github.event.repository.full_name }}-CYG,LOCAL_SUBMIT=ON,NINJA=TRUE,BUILD_GENERATOR=Unix,CTEST_SOURCE_NAME=${{ steps.set-file-base.outputs.SOURCE_BASE }} -C Release -VV -O hdf5.log continue-on-error: true # Save log files created by ctest script diff --git a/.github/workflows/intel-cmake.yml b/.github/workflows/intel-cmake.yml index 2816fa95a25..8cfdcdc1e86 100644 --- a/.github/workflows/intel-cmake.yml +++ b/.github/workflows/intel-cmake.yml @@ -47,8 +47,8 @@ jobs: -DCMAKE_BUILD_TYPE=${{ inputs.build_mode }} \ -DHDF5_BUILD_FORTRAN:BOOL=ON \ -DHDF5_BUILD_CPP_LIB:BOOL=ON \ - -DLIBAEC_USE_LOCALCONTENT=OFF \ - -DZLIB_USE_LOCALCONTENT=OFF \ + -DLIBAEC_USE_LOCALCONTENT:BOOL=OFF \ + -DZLIB_USE_LOCALCONTENT:BOOL=OFF \ ${{ github.workspace }} - name: CMake Build (Linux) diff --git a/.github/workflows/main-cmake.yml b/.github/workflows/main-cmake.yml index 8c110d46ddd..c59167ea6ac 100644 --- a/.github/workflows/main-cmake.yml +++ b/.github/workflows/main-cmake.yml @@ -168,16 +168,16 @@ jobs: ${{ matrix.generator }} \ --log-level=VERBOSE \ -DCMAKE_BUILD_TYPE=${{ inputs.build_mode }} \ - -DBUILD_SHARED_LIBS=ON \ - -DHDF5_ENABLE_ALL_WARNINGS=ON \ - -DHDF5_ENABLE_DOXY_WARNINGS=ON \ + -DBUILD_SHARED_LIBS:BOOL=ON \ + -DHDF5_ENABLE_ALL_WARNINGS:BOOL=ON \ + -DHDF5_ENABLE_DOXY_WARNINGS:BOOL=ON \ -DHDF5_ENABLE_PARALLEL:BOOL=${{ matrix.parallel }} \ -DHDF5_BUILD_CPP_LIB:BOOL=${{ matrix.cpp }} \ - -DHDF5_BUILD_FORTRAN=${{ matrix.fortran }} \ - -DHDF5_BUILD_JAVA=${{ matrix.java }} \ - -DHDF5_BUILD_DOC=${{ matrix.docs }} \ - -DLIBAEC_USE_LOCALCONTENT=${{ matrix.localaec }} \ - -DZLIB_USE_LOCALCONTENT=${{ matrix.localzlib }} \ + -DHDF5_BUILD_FORTRAN:BOOL=${{ matrix.fortran }} \ + -DHDF5_BUILD_JAVA:BOOL=${{ matrix.java }} \ + -DHDF5_BUILD_DOC:BOOL=${{ matrix.docs }} \ + -DLIBAEC_USE_LOCALCONTENT:BOOL=${{ matrix.localaec }} \ + -DZLIB_USE_LOCALCONTENT:BOOL=${{ matrix.localzlib }} \ -DHDF5_ENABLE_MIRROR_VFD:BOOL=${{ matrix.mirror_vfd }} \ -DHDF5_ENABLE_DIRECT_VFD:BOOL=${{ matrix.direct_vfd }} \ -DHDF5_ENABLE_ROS3_VFD:BOOL=${{ matrix.ros3_vfd }} \ @@ -195,18 +195,18 @@ jobs: cmake -C $GITHUB_WORKSPACE/config/cmake/cacheinit.cmake \ ${{ matrix.generator }} \ -DCMAKE_BUILD_TYPE=${{ inputs.build_mode }} \ - -DBUILD_SHARED_LIBS=ON \ - -DBUILD_STATIC_LIBS=${{ (matrix.os != 'windows-latest') }} \ - -DHDF5_ENABLE_ALL_WARNINGS=ON \ + -DBUILD_SHARED_LIBS:BOOL=ON \ + -DBUILD_STATIC_LIBS:BOOL=${{ (matrix.os != 'windows-latest') }} \ + -DHDF5_ENABLE_ALL_WARNINGS:BOOL=ON \ -DHDF5_ENABLE_THREADSAFE:BOOL=ON \ -DHDF5_ENABLE_PARALLEL:BOOL=${{ matrix.parallel }} \ -DHDF5_BUILD_CPP_LIB:BOOL=OFF \ -DHDF5_BUILD_FORTRAN:BOOL=OFF \ -DHDF5_BUILD_JAVA:BOOL=OFF \ -DHDF5_BUILD_HL_LIB:BOOL=OFF \ - -DHDF5_BUILD_DOC=OFF \ - -DLIBAEC_USE_LOCALCONTENT=${{ matrix.localaec }} \ - -DZLIB_USE_LOCALCONTENT=${{ matrix.localzlib }} \ + -DHDF5_BUILD_DOC:BOOL=OFF \ + -DLIBAEC_USE_LOCALCONTENT:BOOL=${{ matrix.localaec }} \ + -DZLIB_USE_LOCALCONTENT:BOOL=${{ matrix.localzlib }} \ -DHDF5_ENABLE_MIRROR_VFD:BOOL=${{ matrix.mirror_vfd }} \ -DHDF5_ENABLE_DIRECT_VFD:BOOL=${{ matrix.direct_vfd }} \ -DHDF5_ENABLE_ROS3_VFD:BOOL=${{ matrix.ros3_vfd }} \ diff --git a/.github/workflows/msys2-cmake.yml b/.github/workflows/msys2-cmake.yml index 46f1a2b4c37..363146c85d5 100644 --- a/.github/workflows/msys2-cmake.yml +++ b/.github/workflows/msys2-cmake.yml @@ -62,16 +62,16 @@ jobs: -G Ninja \ -DCMAKE_BUILD_TYPE=${{ inputs.build_mode }} \ -DCMAKE_TOOLCHAIN_FILE="" \ - -DHDF5_GENERATE_HEADERS=OFF \ - -DBUILD_SHARED_LIBS=ON \ - -DHDF5_ENABLE_ALL_WARNINGS=ON \ + -DHDF5_GENERATE_HEADERS:BOOL=OFF \ + -DBUILD_SHARED_LIBS:BOOL=ON \ + -DHDF5_ENABLE_ALL_WARNINGS:BOOL=ON \ -DHDF5_ENABLE_PARALLEL:BOOL=OFF \ -DHDF5_BUILD_CPP_LIB:BOOL=OFF \ - -DHDF5_BUILD_FORTRAN=OFF \ - -DHDF5_BUILD_JAVA=OFF \ - -DHDF5_BUILD_DOC=OFF \ - -DLIBAEC_USE_LOCALCONTENT=OFF \ - -DZLIB_USE_LOCALCONTENT=OFF \ + -DHDF5_BUILD_FORTRAN:BOOL=OFF \ + -DHDF5_BUILD_JAVA:BOOL=OFF \ + -DHDF5_BUILD_DOC:BOOL=OFF \ + -DLIBAEC_USE_LOCALCONTENT:BOOL=OFF \ + -DZLIB_USE_LOCALCONTENT:BOOL=OFF \ $GITHUB_WORKSPACE - name: CMake Build diff --git a/.github/workflows/netcdf.yml b/.github/workflows/netcdf.yml index ab92a1e68ec..e23e45fea4b 100644 --- a/.github/workflows/netcdf.yml +++ b/.github/workflows/netcdf.yml @@ -44,14 +44,14 @@ jobs: cmake -C $GITHUB_WORKSPACE/config/cmake/cacheinit.cmake \ -G Ninja \ -DCMAKE_BUILD_TYPE=Release \ - -DONLY_SHARED_LIBS=ON \ + -DONLY_SHARED_LIBS:BOOL=ON \ -DHDF5_ENABLE_PARALLEL:BOOL=OFF \ -DHDF5_BUILD_CPP_LIB:BOOL=OFF \ - -DHDF5_BUILD_FORTRAN=OFF \ - -DHDF5_BUILD_JAVA=OFF \ - -DHDF5_BUILD_DOC=OFF \ - -DLIBAEC_USE_LOCALCONTENT=OFF \ - -DZLIB_USE_LOCALCONTENT=OFF \ + -DHDF5_BUILD_FORTRAN:BOOL=OFF \ + -DHDF5_BUILD_JAVA:BOOL=OFF \ + -DHDF5_BUILD_DOC:BOOL=OFF \ + -DLIBAEC_USE_LOCALCONTENT:BOOL=OFF \ + -DZLIB_USE_LOCALCONTENT:BOOL=OFF \ -DH5_NO_DEPRECATED_SYMBOLS:BOOL=OFF \ -DBUILD_TESTING:BOOL=OFF \ -DCMAKE_INSTALL_PREFIX:PATH=/usr/local \ diff --git a/.github/workflows/nvhpc-cmake.yml b/.github/workflows/nvhpc-cmake.yml index 64242d44347..e46d139611b 100644 --- a/.github/workflows/nvhpc-cmake.yml +++ b/.github/workflows/nvhpc-cmake.yml @@ -57,8 +57,8 @@ jobs: -DMPIEXEC_NUMPROC_FLAG:STRING=-np \ -DMPIEXEC_MAX_NUMPROCS:STRING=2 \ -DHDF5_BUILD_CPP_LIB:BOOL=OFF \ - -DLIBAEC_USE_LOCALCONTENT=OFF \ - -DZLIB_USE_LOCALCONTENT=OFF \ + -DLIBAEC_USE_LOCALCONTENT:BOOL=OFF \ + -DZLIB_USE_LOCALCONTENT:BOOL=OFF \ -DHDF5_BUILD_FORTRAN:BOOL=ON \ -DHDF5_BUILD_JAVA:BOOL=OFF \ -DMPIEXEC_MAX_NUMPROCS:STRING="2" \ diff --git a/CMakeFilters.cmake b/CMakeFilters.cmake index 3eca6e743c8..431bbb65b5e 100644 --- a/CMakeFilters.cmake +++ b/CMakeFilters.cmake @@ -154,13 +154,13 @@ if (HDF5_ENABLE_SZIP_SUPPORT) option (HDF5_ENABLE_SZIP_ENCODING "Use SZip Encoding" ON) if (NOT SZIP_USE_EXTERNAL) if (HDF5_USE_LIBAEC_STATIC) - set(LIBAEC_SEACH_TYPE static) + set(LIBAEC_SEARCH_TYPE static) else () - set(LIBAEC_SEACH_TYPE shared) + set(LIBAEC_SEARCH_TYPE shared) endif () set(libaec_USE_STATIC_LIBS ${HDF5_USE_LIBAEC_STATIC}) set(SZIP_FOUND FALSE) - find_package (SZIP NAMES ${LIBAEC_PACKAGE_NAME}${HDF_PACKAGE_EXT} COMPONENTS ${LIBAEC_SEACH_TYPE}) + find_package (SZIP NAMES ${LIBAEC_PACKAGE_NAME}${HDF_PACKAGE_EXT} COMPONENTS ${LIBAEC_SEARCH_TYPE}) if (NOT SZIP_FOUND) find_package (SZIP) # Legacy find endif () diff --git a/CMakePresets.json b/CMakePresets.json index b065b554433..c0a3f6fed28 100644 --- a/CMakePresets.json +++ b/CMakePresets.json @@ -274,12 +274,7 @@ "configurePreset": "ci-StdShar-MSVC", "inherits": [ "ci-x64-Release-MSVC" - ], - "filter": { - "exclude": { - "name": "H5DUMP-tfloatsattrs" - } - } + ] }, { "name": "ci-StdShar-Clang", @@ -327,11 +322,6 @@ "inherits": [ "ci-x64-Release-Intel" ], - "filter": { - "exclude": { - "name": "H5DUMP-tfloatsattrs" - } - }, "condition": { "type": "equals", "lhs": "${hostSystemName}", diff --git a/config/cmake/ConfigureChecks.cmake b/config/cmake/ConfigureChecks.cmake index c992756829e..63ef3bce811 100644 --- a/config/cmake/ConfigureChecks.cmake +++ b/config/cmake/ConfigureChecks.cmake @@ -147,7 +147,7 @@ if (MINGW OR CYGWIN) endif () #----------------------------------------------------------------------------- -# Check for the math library "m" +# Library checks #----------------------------------------------------------------------------- if (MINGW OR NOT WINDOWS) CHECK_LIBRARY_EXISTS_CONCAT ("m" ceil ${HDF_PREFIX}_HAVE_LIBM)