diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2018-09-26 20:47:19 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2018-09-26 20:47:19 (GMT) |
| commit | cc8538e1ed2d521fb287426b1767479db6b67fee (patch) | |
| tree | 063a4428027af95930e725618c5b951a69e74564 | |
| parent | ab84c029c492ce8c9d3bac8e03bf07e760de9cd7 (diff) | |
| parent | d26bb4d26ce5a23804a80c16dcb53e5f3eb957e4 (diff) | |
| download | hdf5-cc8538e1ed2d521fb287426b1767479db6b67fee.zip hdf5-cc8538e1ed2d521fb287426b1767479db6b67fee.tar.gz hdf5-cc8538e1ed2d521fb287426b1767479db6b67fee.tar.bz2 | |
Merge pull request #1258 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to develop
* commit 'd26bb4d26ce5a23804a80c16dcb53e5f3eb957e4':
HDFFV-10594 - mac must be space separated
HDFFV-10594 - Add rpath configuration note
Add extra path option for build location
Use relative RPATH paths
| -rw-r--r-- | config/cmake_ext_mod/HDFMacros.cmake | 15 | ||||
| -rw-r--r-- | release_docs/RELEASE.txt | 10 |
2 files changed, 25 insertions, 0 deletions
diff --git a/config/cmake_ext_mod/HDFMacros.cmake b/config/cmake_ext_mod/HDFMacros.cmake index aa18022..147ae2f 100644 --- a/config/cmake_ext_mod/HDFMacros.cmake +++ b/config/cmake_ext_mod/HDFMacros.cmake @@ -358,6 +358,21 @@ macro (HDF_DIR_PATHS package_prefix) endif () endif () + set (CMAKE_SKIP_BUILD_RPATH FALSE) + set (CMAKE_INSTALL_RPATH_USE_LINK_PATH FALSE) + set (CMAKE_BUILD_WITH_INSTALL_RPATH ON) + if (APPLE) + set (CMAKE_INSTALL_NAME_DIR "@rpath") + set (CMAKE_INSTALL_RPATH + "@executable_path/../${${package_prefix}_INSTALL_LIB_DIR}" + "@executable_path/" + "@loader_path/../${${package_prefix}_INSTALL_LIB_DIR}" + "@loader_path/" + ) + else () + set (CMAKE_INSTALL_RPATH "\$ORIGIN/../${${package_prefix}_INSTALL_LIB_DIR}:\$ORIGIN/") + endif () + if (DEFINED ADDITIONAL_CMAKE_PREFIX_PATH AND EXISTS "${ADDITIONAL_CMAKE_PREFIX_PATH}") set (CMAKE_PREFIX_PATH ${ADDITIONAL_CMAKE_PREFIX_PATH} ${CMAKE_PREFIX_PATH}) endif () diff --git a/release_docs/RELEASE.txt b/release_docs/RELEASE.txt index 393a9b2..3acc1ed 100644 --- a/release_docs/RELEASE.txt +++ b/release_docs/RELEASE.txt @@ -48,6 +48,16 @@ New Features Configuration: ------------- + - Add default rpath to targets + + Default rpaths should be set in shared executables and + libraries to allow the use of loading dependent libraries + without requiring LD_LIBRARY_PATH to be set. The default + path should be relative using @rpath on osx and $ORIGIN + on linux. Windows is not affected. + + (ADB - 2018/09/26, HDFFV-10594) + - Add missing USE_110_API_DEFAULT option. Option USE_110_API_DEFAULT sets the default version of |