diff options
| author | Dana Robinson <43805+derobins@users.noreply.github.com> | 2023-06-06 13:44:33 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-06-06 13:44:33 (GMT) |
| commit | 4c57a5b06417e823eef153ae306a6ce06bd907ee (patch) | |
| tree | dc0784d24d72b44e4b25797bec8f000496c9886f /config | |
| parent | b5b1f4c7dfcc4a40af7c6c8ab1c89e49054f33c6 (diff) | |
| download | hdf5-4c57a5b06417e823eef153ae306a6ce06bd907ee.zip hdf5-4c57a5b06417e823eef153ae306a6ce06bd907ee.tar.gz hdf5-4c57a5b06417e823eef153ae306a6ce06bd907ee.tar.bz2 | |
Bring key changesets from develop (#3052)
* Bump GitHub action macOS version to 13 (#2999, #3009)
* Bump GitHub action gcc/g++/gfortran version to 12 (#3015)
* Bump Autoconf version to 2.71 (#2944)
* Fix missing h5_reset() calls in accum test (#3001)
* Only run ttsafe in GitHub thread-safe actions (#2777)
* Fix Java debug asserts on Windows (#3012)
* Fix long double dt_arith bug on macOS (#3038)
Diffstat (limited to 'config')
| -rw-r--r-- | config/cmake/HDF5_Examples.cmake.in | 5 | ||||
| -rw-r--r-- | config/cmake/jrunTest.cmake | 2 | ||||
| -rw-r--r-- | config/cmake_ext_mod/grepTest.cmake | 2 | ||||
| -rw-r--r-- | config/cmake_ext_mod/runTest.cmake | 2 |
4 files changed, 11 insertions, 0 deletions
diff --git a/config/cmake/HDF5_Examples.cmake.in b/config/cmake/HDF5_Examples.cmake.in index 21a1dbb..9f3db03 100644 --- a/config/cmake/HDF5_Examples.cmake.in +++ b/config/cmake/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/jrunTest.cmake b/config/cmake/jrunTest.cmake index 13e50dd..f6fa3b3 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_ext_mod/grepTest.cmake b/config/cmake_ext_mod/grepTest.cmake index 631fca6..c4a6eb7 100644 --- a/config/cmake_ext_mod/grepTest.cmake +++ b/config/cmake_ext_mod/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_ext_mod/runTest.cmake b/config/cmake_ext_mod/runTest.cmake index b373fe4..d1c454f 100644 --- a/config/cmake_ext_mod/runTest.cmake +++ b/config/cmake_ext_mod/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 () |