MacOS: embed Rpath into executables

Author: scivision

.github/workflows/ci_macos.yml

@@ -106,6 +106,10 @@ jobs:
     - run: ctest --test-dir build --preset default
     - run: cmake --install build
 
+    - run: cmake -S Examples -B Examples/build -Dh5fortran_ROOT=~
+    - run: cmake --build Examples/build
+    - run: ctest --test-dir Examples/build -V
+
 
   mac-build-shared:
     needs: [mac-shared, mac-build-static]
@@ -119,3 +123,7 @@ jobs:
     - run: cmake --build build
     - run: ctest --test-dir build --preset default
     - run: cmake --install build
+
+    - run: cmake -S Examples -B Examples/build -Dh5fortran_ROOT=~
+    - run: cmake --build Examples/build
+    - run: ctest --test-dir Examples/build -V

cmake/build_hdf5.cmake

@@ -6,9 +6,6 @@ include(ExternalProject)
 
 set(hdf5_external true CACHE BOOL "autobuild HDF5")
 
-set(CMAKE_INSTALL_NAME_DIR ${CMAKE_INSTALL_PREFIX}/lib)
-# MacOS:shared: HDF5 package is mistaken RPATH otherwise
-
 if(hdf5_parallel)
   find_package(MPI REQUIRED COMPONENTS C)
 endif()

cmake/dll_path.cmake

@@ -3,6 +3,10 @@
 
 set(DLL_PATH)
 
+if(NOT (MSVC OR BUILD_SHARED_LIBS))
+  return()
+endif()
+
 if(MSVC OR (MINGW AND BUILD_SHARED_LIBS))
 
   if(hdf5_external)
@@ -26,16 +30,8 @@ if(MSVC OR (MINGW AND BUILD_SHARED_LIBS))
 
   # this is the vital line, without it CMake set_tests_properties mangles the ENVIRONMENT
   string(REPLACE ";" "\\;" DLL_PATH "${DLL_PATH}")
-elseif(APPLE AND BUILD_SHARED_LIBS)
-
-  if(hdf5_external)
-    set(DLL_PATH "${ZLIB_ROOT}/lib:$ENV{DYLD_FALLBACK_LIBRARY_PATH}")
-  endif()
-
-elseif(UNIX AND BUILD_SHARED_LIBS)
-
-  if(hdf5_external)
-    set(DLL_PATH "${ZLIB_ROOT}/lib:$ENV{LD_LIBRARY_PATH}")
-  endif()
-
+elseif(APPLE AND hdf5_external)
+  set(CMAKE_INSTALL_NAME_DIR ${CMAKE_INSTALL_PREFIX}/lib)
+elseif(UNIX AND hdf5_external)
+  set(DLL_PATH "${ZLIB_ROOT}/lib:$ENV{LD_LIBRARY_PATH}")
 endif()

src/tests/CMakeLists.txt

@@ -15,7 +15,7 @@ if(DLL_PATH)
     set_tests_properties(h5fortran:minimal PROPERTIES ENVIRONMENT "Path=${DLL_PATH}")
     # set_tests_properties(h5fortran:minimal PROPERTIES ENVIRONMENT_MODIFICATION "Path=path_list_prepend:${DLL_PATH}")
   elseif(APPLE)
-    set_tests_properties(h5fortran:minimal PROPERTIES ENVIRONMENT "DYLD_LIBRARY_PATH=${DLL_PATH}")
+
   elseif(UNIX)
     set_tests_properties(h5fortran:minimal PROPERTIES ENVIRONMENT "LD_LIBRARY_PATH=${DLL_PATH}")
   endif()
@@ -45,7 +45,7 @@ if(DLL_PATH)
     set_tests_properties(h5fortran:${name} PROPERTIES ENVIRONMENT "Path=${DLL_PATH}")
     # set_tests_properties(h5fortran:${name} PROPERTIES ENVIRONMENT_MODIFICATION "Path=path_list_prepend:${DLL_PATH}")
   elseif(APPLE)
-    set_tests_properties(h5fortran:${name} PROPERTIES ENVIRONMENT "DYLD_LIBRARY_PATH=${DLL_PATH}")
+
   elseif(UNIX)
     set_tests_properties(h5fortran:minimal PROPERTIES ENVIRONMENT "LD_LIBRARY_PATH=${DLL_PATH}")
   endif()