diff options
-rw-r--r-- | .github/workflows/main.yml | 6 | ||||
-rw-r--r-- | .github/workflows/pr-check.yml | 6 | ||||
-rw-r--r-- | c++/src/CMakeLists.txt | 4 | ||||
-rw-r--r-- | fortran/src/CMakeLists.txt | 4 | ||||
-rw-r--r-- | hl/c++/src/CMakeLists.txt | 4 | ||||
-rw-r--r-- | hl/fortran/src/CMakeLists.txt | 4 | ||||
-rw-r--r-- | hl/src/CMakeLists.txt | 4 | ||||
-rw-r--r-- | release_docs/RELEASE.txt | 7 | ||||
-rw-r--r-- | tools/h5dump/CMakeTests.cmake | 2 |
9 files changed, 24 insertions, 17 deletions
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 3853eda..95d9898 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -43,7 +43,7 @@ jobs: generator: "-G Ninja" - name: "macOS Latest Clang" artifact: "macOS.tar.xz" - os: macos-latest + os: macos-11 build_type: "Release" cpp: ON fortran: OFF @@ -99,7 +99,7 @@ jobs: generator: "-G Ninja" - name: "macOS TS Clang" artifact: "macOSTS.tar.xz" - os: macos-latest + os: macos-11 build_type: "Release" cpp: OFF fortran: OFF @@ -158,7 +158,7 @@ jobs: if: matrix.os == 'windows-latest' - name: Install Dependencies (macOS) run: brew install ninja - if: matrix.os == 'macos-latest' + if: matrix.os == 'macos-11' - name: Set environment for MSVC (Windows) if: matrix.os == 'windows-latest' run: | diff --git a/.github/workflows/pr-check.yml b/.github/workflows/pr-check.yml index 6383617..dd8a8ab 100644 --- a/.github/workflows/pr-check.yml +++ b/.github/workflows/pr-check.yml @@ -38,7 +38,7 @@ jobs: generator: "-G Ninja" - name: "macOS Latest Clang" artifact: "macOS.tar.xz" - os: macos-latest + os: macos-11 build_type: "Release" cpp: ON fortran: OFF @@ -94,7 +94,7 @@ jobs: generator: "-G Ninja" - name: "macOS TS Clang" artifact: "macOSTS.tar.xz" - os: macos-latest + os: macos-11 build_type: "Release" cpp: OFF fortran: OFF @@ -153,7 +153,7 @@ jobs: if: matrix.os == 'windows-latest' - name: Install Dependencies (macOS) run: brew install ninja - if: matrix.os == 'macos-latest' + if: matrix.os == 'macos-11' - name: Set environment for MSVC (Windows) if: matrix.os == 'windows-latest' run: | diff --git a/c++/src/CMakeLists.txt b/c++/src/CMakeLists.txt index da11161..e44020c 100644 --- a/c++/src/CMakeLists.txt +++ b/c++/src/CMakeLists.txt @@ -196,8 +196,8 @@ if (BUILD_SHARED_LIBS) set (_PKG_CONFIG_SH_LIBS "${_PKG_CONFIG_SH_LIBS} -l${HDF5_CPP_LIB_CORENAME}") endif () -set (_PKG_CONFIG_REQUIRES "${HDF5_LIB_CORENAME}-${HDF5_PACKAGE_VERSION}") -set (_PKG_CONFIG_REQUIRES_PRIVATE "${HDF5_LIB_CORENAME}-${HDF5_PACKAGE_VERSION}") +set (_PKG_CONFIG_REQUIRES "${HDF5_LIB_CORENAME} = ${HDF5_PACKAGE_VERSION}") +set (_PKG_CONFIG_REQUIRES_PRIVATE "${HDF5_LIB_CORENAME} = ${HDF5_PACKAGE_VERSION}") configure_file ( ${HDF_CONFIG_DIR}/libhdf5.pc.in diff --git a/fortran/src/CMakeLists.txt b/fortran/src/CMakeLists.txt index d2301ad..8ee8528 100644 --- a/fortran/src/CMakeLists.txt +++ b/fortran/src/CMakeLists.txt @@ -581,8 +581,8 @@ if (BUILD_SHARED_LIBS AND NOT SKIP_HDF5_FORTRAN_SHARED) set (_PKG_CONFIG_SH_LIBS "${_PKG_CONFIG_SH_LIBS} -l${HDF5_F90_LIB_CORENAME}") endif () -set (_PKG_CONFIG_REQUIRES "${HDF5_LIB_CORENAME}-${HDF5_PACKAGE_VERSION}") -set (_PKG_CONFIG_REQUIRES_PRIVATE "${HDF5_LIB_CORENAME}-${HDF5_PACKAGE_VERSION}") +set (_PKG_CONFIG_REQUIRES "${HDF5_LIB_CORENAME} = ${HDF5_PACKAGE_VERSION}") +set (_PKG_CONFIG_REQUIRES_PRIVATE "${HDF5_LIB_CORENAME} = ${HDF5_PACKAGE_VERSION}") configure_file ( ${HDF_CONFIG_DIR}/libhdf5.fpc.in diff --git a/hl/c++/src/CMakeLists.txt b/hl/c++/src/CMakeLists.txt index e56d627..ab09d74 100644 --- a/hl/c++/src/CMakeLists.txt +++ b/hl/c++/src/CMakeLists.txt @@ -105,8 +105,8 @@ if (BUILD_SHARED_LIBS) set (_PKG_CONFIG_SH_LIBS "${_PKG_CONFIG_SH_LIBS} -l${HDF5_HL_CPP_LIB_CORENAME}") endif () -set (_PKG_CONFIG_REQUIRES "${HDF5_HL_LIB_CORENAME}-${HDF5_PACKAGE_VERSION}") -set (_PKG_CONFIG_REQUIRES_PRIVATE "${HDF5_HL_LIB_CORENAME}-${HDF5_PACKAGE_VERSION}") +set (_PKG_CONFIG_REQUIRES "${HDF5_HL_LIB_CORENAME} = ${HDF5_PACKAGE_VERSION}") +set (_PKG_CONFIG_REQUIRES_PRIVATE "${HDF5_HL_LIB_CORENAME} = ${HDF5_PACKAGE_VERSION}") configure_file ( ${HDF_CONFIG_DIR}/libhdf5.pc.in diff --git a/hl/fortran/src/CMakeLists.txt b/hl/fortran/src/CMakeLists.txt index 2bae90f..25adcf7 100644 --- a/hl/fortran/src/CMakeLists.txt +++ b/hl/fortran/src/CMakeLists.txt @@ -246,8 +246,8 @@ if (BUILD_SHARED_LIBS AND NOT SKIP_HDF5_FORTRAN_SHARED) set (_PKG_CONFIG_SH_LIBS "${_PKG_CONFIG_SH_LIBS} -l${HDF5_HL_F90_LIB_CORENAME}") endif () -set (_PKG_CONFIG_REQUIRES "${HDF5_F90_LIB_CORENAME}-${HDF5_PACKAGE_VERSION}") -set (_PKG_CONFIG_REQUIRES_PRIVATE "${HDF5_F90_LIB_CORENAME}-${HDF5_PACKAGE_VERSION}") +set (_PKG_CONFIG_REQUIRES "${HDF5_F90_LIB_CORENAME} = ${HDF5_PACKAGE_VERSION}") +set (_PKG_CONFIG_REQUIRES_PRIVATE "${HDF5_F90_LIB_CORENAME} = ${HDF5_PACKAGE_VERSION}") configure_file ( ${HDF_CONFIG_DIR}/libhdf5.fpc.in diff --git a/hl/src/CMakeLists.txt b/hl/src/CMakeLists.txt index 5784514..51c1b77 100644 --- a/hl/src/CMakeLists.txt +++ b/hl/src/CMakeLists.txt @@ -133,8 +133,8 @@ if (BUILD_SHARED_LIBS) set (_PKG_CONFIG_SH_LIBS "${_PKG_CONFIG_SH_LIBS} -l${HDF5_HL_LIB_CORENAME}") endif () -set (_PKG_CONFIG_REQUIRES "${HDF5_LIB_CORENAME}-${HDF5_PACKAGE_VERSION}") -set (_PKG_CONFIG_REQUIRES_PRIVATE "${HDF5_LIB_CORENAME}-${HDF5_PACKAGE_VERSION}") +set (_PKG_CONFIG_REQUIRES "${HDF5_LIB_CORENAME} = ${HDF5_PACKAGE_VERSION}") +set (_PKG_CONFIG_REQUIRES_PRIVATE "${HDF5_LIB_CORENAME} = ${HDF5_PACKAGE_VERSION}") configure_file ( ${HDF_CONFIG_DIR}/libhdf5.pc.in diff --git a/release_docs/RELEASE.txt b/release_docs/RELEASE.txt index db8d0d2..8d0133e 100644 --- a/release_docs/RELEASE.txt +++ b/release_docs/RELEASE.txt @@ -263,6 +263,13 @@ Bug Fixes since HDF5-1.8.22 Configuration ------------- + - Change the settings of the *pc files to use the correct format + + The pkg-config files generated by CMake uses incorrect syntax for the 'Requires' + settings. Changing the set to use 'lib-name = version' instead 'lib-name-version' + fixes the issue + + (ADB - 2022/12/06 HDFFV-11355) - Move MPI libraries link from PRIVATE to PUBLIC The install dependencies were not including the need for MPI libraries when diff --git a/tools/h5dump/CMakeTests.cmake b/tools/h5dump/CMakeTests.cmake index c79c1e3..ece3aa4 100644 --- a/tools/h5dump/CMakeTests.cmake +++ b/tools/h5dump/CMakeTests.cmake @@ -1110,7 +1110,7 @@ ADD_H5ERR_MASK_TEST (torderlinks2 0 "unable to open external file, external link file name = 'fname'" --enable-error-stack --sort_by=name --sort_order=descending tfcontents1.h5) # tests for floating point user defined printf format - ADD_H5_TEST (tfpformat 0 --enable-error-stack -m %.7f tfpformat.h5) + ADD_H5_TEST (tfpformat 0 --enable-error-stack --format=%.7f tfpformat.h5) # tests for traversal of external links ADD_H5ERR_MASK_TEST (textlinksrc 0 "Too many soft links in path" --enable-error-stack textlinksrc.h5) |