rpath unix. Only windows needs DLL_PATH

Author: scivision

cmake/dll_path.cmake

@@ -30,8 +30,7 @@ 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 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}")
+  set(CMAKE_INSTALL_NAME_DIR ${CMAKE_INSTALL_PREFIX}/lib)
+  set(CMAKE_INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib)
 endif()

src/tests/CMakeLists.txt

@@ -11,14 +11,8 @@ TIMEOUT 5
 LABELS core
 )
 if(DLL_PATH)
-  if(WIN32)
-    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)
-
-  elseif(UNIX)
-    set_tests_properties(h5fortran:minimal PROPERTIES ENVIRONMENT "LD_LIBRARY_PATH=${DLL_PATH}")
-  endif()
+  set_tests_properties(h5fortran:minimal PROPERTIES ENVIRONMENT "Path=${DLL_PATH}")
+  # set_tests_properties(h5fortran:minimal PROPERTIES ENVIRONMENT_MODIFICATION "Path=path_list_prepend:${DLL_PATH}")
 endif()
 
 function(setup_test names)
@@ -41,14 +35,8 @@ FIXTURES_REQUIRED h5lib
 TIMEOUT 10
 )
 if(DLL_PATH)
-  if(WIN32)
-    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)
-
-  elseif(UNIX)
-    set_tests_properties(h5fortran:minimal PROPERTIES ENVIRONMENT "LD_LIBRARY_PATH=${DLL_PATH}")
-  endif()
+  set_tests_properties(h5fortran:${name} PROPERTIES ENVIRONMENT "Path=${DLL_PATH}")
+  # set_tests_properties(h5fortran:${name} PROPERTIES ENVIRONMENT_MODIFICATION "Path=path_list_prepend:${DLL_PATH}")
 endif()