diff options
| author | Dana Robinson <43805+derobins@users.noreply.github.com> | 2023-05-24 13:05:17 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-05-24 13:05:17 (GMT) |
| commit | 37e0484af5b6e1d7ed637725bee24ecf758a43e9 (patch) | |
| tree | bd902fbc0be0e6a8a2c42e1728ef146d4623950a | |
| parent | 68abd201b2aa56cbc5c7bfee99bcb8d9612eb73a (diff) | |
| download | hdf5-37e0484af5b6e1d7ed637725bee24ecf758a43e9.zip hdf5-37e0484af5b6e1d7ed637725bee24ecf758a43e9.tar.gz hdf5-37e0484af5b6e1d7ed637725bee24ecf758a43e9.tar.bz2 | |
Update GitHub macOS actions to v13 (#2999)
* Update macOS to 13
* Fix the DYLD_LIBRARY_PATH issue on macOS 12 & 13 + CMake that caused the accum test to fail
| -rw-r--r-- | .github/workflows/main.yml | 6 | ||||
| -rw-r--r-- | config/cmake/examples/HDF5_Examples.cmake.in | 5 | ||||
| -rw-r--r-- | config/cmake/grepTest.cmake | 2 | ||||
| -rw-r--r-- | config/cmake/jrunTest.cmake | 2 | ||||
| -rw-r--r-- | config/cmake/runTest.cmake | 2 |
5 files changed, 14 insertions, 3 deletions
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index c5d2d42..96ed60f 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -157,7 +157,7 @@ jobs: # We could also build with the Autotools via brew installing them, # but that seems unnecessary - name: "MacOS Clang CMake" - os: macos-11 + os: macos-13 cpp: ON fortran: OFF java: ON @@ -462,7 +462,7 @@ jobs: - name: Install Dependencies (macOS) run: brew install ninja - if: matrix.os == 'macos-11' + if: matrix.os == 'macos-13' - name: Set environment for MSVC (Windows) run: | @@ -530,7 +530,7 @@ jobs: - name: CMake Build run: cmake --build . --parallel 3 --config ${{ matrix.build_mode.cmake }} working-directory: ${{ runner.workspace }}/build - if: matrix.generator != 'autogen' + if: (matrix.generator != 'autogen') # # RUN TESTS diff --git a/config/cmake/examples/HDF5_Examples.cmake.in b/config/cmake/examples/HDF5_Examples.cmake.in index d2661a7..797cfd2 100644 --- a/config/cmake/examples/HDF5_Examples.cmake.in +++ b/config/cmake/examples/HDF5_Examples.cmake.in @@ -87,6 +87,11 @@ if(WIN32) set(CTEST_BINARY_NAME ${CTEST_SOURCE_NAME}\\build) set(CTEST_SOURCE_DIRECTORY "${CTEST_DASHBOARD_ROOT}\\${CTEST_SOURCE_NAME}") set(CTEST_BINARY_DIRECTORY "${CTEST_DASHBOARD_ROOT}\\${CTEST_BINARY_NAME}") +else(APPLE) + set(ENV{DYLD_LIBRARY_PATH} "${INSTALLDIR}/lib") + set(CTEST_BINARY_NAME ${CTEST_SOURCE_NAME}/build) + set(CTEST_SOURCE_DIRECTORY "${CTEST_DASHBOARD_ROOT}/${CTEST_SOURCE_NAME}") + set(CTEST_BINARY_DIRECTORY "${CTEST_DASHBOARD_ROOT}/${CTEST_BINARY_NAME}") else() set(ENV{LD_LIBRARY_PATH} "${INSTALLDIR}/lib") set(CTEST_BINARY_NAME ${CTEST_SOURCE_NAME}/build) diff --git a/config/cmake/grepTest.cmake b/config/cmake/grepTest.cmake index 9e80956..6e51dec 100644 --- a/config/cmake/grepTest.cmake +++ b/config/cmake/grepTest.cmake @@ -42,6 +42,8 @@ message (STATUS "COMMAND: ${TEST_EMULATOR} ${TEST_PROGRAM} ${TEST_ARGS}") if (TEST_LIBRARY_DIRECTORY) if (WIN32) set (ENV{PATH} "$ENV{PATH};${TEST_LIBRARY_DIRECTORY}") + elseif (APPLE) + set (ENV{DYLD_LIBRARY_PATH} "$ENV{DYLD_LIBRARY_PATH}:${TEST_LIBRARY_DIRECTORY}") else () set (ENV{LD_LIBRARY_PATH} "$ENV{LD_LIBRARY_PATH}:${TEST_LIBRARY_DIRECTORY}") endif () diff --git a/config/cmake/jrunTest.cmake b/config/cmake/jrunTest.cmake index 21183af..d7d83d4 100644 --- a/config/cmake/jrunTest.cmake +++ b/config/cmake/jrunTest.cmake @@ -56,6 +56,8 @@ endif () if (WIN32) set (ENV{PATH} "$ENV{PATH}\\;${TEST_LIBRARY_DIRECTORY}") +elseif (APPLE) + set (ENV{DYLD_LIBRARY_PATH} "$ENV{DYLD_LIBRARY_PATH}:${TEST_LIBRARY_DIRECTORY}") else () set (ENV{LD_LIBRARY_PATH} "$ENV{LD_LIBRARY_PATH}:${TEST_LIBRARY_DIRECTORY}") endif () diff --git a/config/cmake/runTest.cmake b/config/cmake/runTest.cmake index 12b4818..0d05424 100644 --- a/config/cmake/runTest.cmake +++ b/config/cmake/runTest.cmake @@ -40,6 +40,8 @@ message (STATUS "COMMAND: ${TEST_EMULATOR} ${TEST_PROGRAM} ${TEST_ARGS}") if (TEST_LIBRARY_DIRECTORY) if (WIN32) set (ENV{PATH} "$ENV{PATH};${TEST_LIBRARY_DIRECTORY}") + elseif (APPLE) + set (ENV{DYLD_LIBRARY_PATH} "$ENV{DYLD_LIBRARY_PATH}:${TEST_LIBRARY_DIRECTORY}") else () set (ENV{LD_LIBRARY_PATH} "$ENV{LD_LIBRARY_PATH}:${TEST_LIBRARY_DIRECTORY}") endif () |