diff options
| author | Allen Byrne <50328838+byrnHDF@users.noreply.github.com> | 2023-06-05 23:24:01 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-06-05 23:24:01 (GMT) |
| commit | 53dd2f21bfdf0b2bfa8424a7f1ccdcd7f0aa0749 (patch) | |
| tree | 3f5d75edf445d3b024b7bb835bd44fa769499ab1 | |
| parent | e03ffa18bc5aece3ebfbbcd3221589eebb6e918e (diff) | |
| download | hdf5-53dd2f21bfdf0b2bfa8424a7f1ccdcd7f0aa0749.zip hdf5-53dd2f21bfdf0b2bfa8424a7f1ccdcd7f0aa0749.tar.gz hdf5-53dd2f21bfdf0b2bfa8424a7f1ccdcd7f0aa0749.tar.bz2 | |
Fix multiConfig variable usage and remove unused CMake vars (#3048)
| -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 |
4 files changed, 11 insertions, 0 deletions
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 () |