diff --git a/HDF5Examples/config/cmake/HDFMacros.cmake b/HDF5Examples/config/cmake/HDFMacros.cmake index a2d0fbbb53d..77635babfda 100644 --- a/HDF5Examples/config/cmake/HDFMacros.cmake +++ b/HDF5Examples/config/cmake/HDFMacros.cmake @@ -169,26 +169,6 @@ macro (HDF_DIR_PATHS package_prefix) endif () message(STATUS "Final: ${${package_prefix}_INSTALL_DOC_DIR}") - # Always use full RPATH, i.e. don't skip the full RPATH for the build tree - set (CMAKE_SKIP_BUILD_RPATH OFF) - # when building, don't use the install RPATH already - # (but later on when installing) - set (CMAKE_INSTALL_RPATH_USE_LINK_PATH OFF) - # add the automatically determined parts of the RPATH - # which point to directories outside the build tree to the install RPATH - 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/config/cmake/HDF5Macros.cmake b/config/cmake/HDF5Macros.cmake index e1bb13315f5..52603149d9b 100644 --- a/config/cmake/HDF5Macros.cmake +++ b/config/cmake/HDF5Macros.cmake @@ -35,29 +35,6 @@ macro (H5_SET_LIB_OPTIONS libtarget libname libtype libpackage) endif () endif () HDF_SET_LIB_OPTIONS (${libtarget} ${LIB_OUT_NAME} ${libtype}) - - #-- Apple Specific install_name for libraries - if (APPLE) - option (HDF5_BUILD_WITH_INSTALL_NAME "Build with library install_name set to the installation path" OFF) - if (HDF5_BUILD_WITH_INSTALL_NAME) - set_target_properties (${libtarget} PROPERTIES - INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/lib" - BUILD_WITH_INSTALL_RPATH ${HDF5_BUILD_WITH_INSTALL_NAME} - ) - endif () - if (HDF5_BUILD_FRAMEWORKS) - if (${libtype} MATCHES "SHARED") - # adapt target to build frameworks instead of dylibs - set_target_properties(${libtarget} PROPERTIES - XCODE_ATTRIBUTE_INSTALL_PATH "@rpath" - FRAMEWORK TRUE - FRAMEWORK_VERSION ${HDF5_PACKAGE_VERSION_MAJOR} - MACOSX_FRAMEWORK_IDENTIFIER org.hdfgroup.${libtarget} - MACOSX_FRAMEWORK_SHORT_VERSION_STRING ${HDF5_PACKAGE_VERSION_MAJOR} - MACOSX_FRAMEWORK_BUNDLE_VERSION ${HDF5_PACKAGE_VERSION_MAJOR}) - endif () - endif () - endif () endmacro () # Initialize the list of VFDs to be used for testing and create a test folder for each VFD diff --git a/config/cmake/HDFMacros.cmake b/config/cmake/HDFMacros.cmake index 018c7d8daa0..f7023e70da9 100644 --- a/config/cmake/HDFMacros.cmake +++ b/config/cmake/HDFMacros.cmake @@ -458,26 +458,6 @@ macro (HDF_DIR_PATHS package_prefix) endif () message(STATUS "Final: ${${package_prefix}_INSTALL_DOC_DIR}") - # Always use full RPATH, i.e. don't skip the full RPATH for the build tree - set (CMAKE_SKIP_BUILD_RPATH OFF) - # when building, don't use the install RPATH already - # (but later on when installing) - set (CMAKE_INSTALL_RPATH_USE_LINK_PATH OFF) - # add the automatically determined parts of the RPATH - # which point to directories outside the build tree to the install RPATH - 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/config/cmake/examples/CTestScript.cmake b/config/cmake/examples/CTestScript.cmake index 7f50564b454..0b318d1147d 100644 --- a/config/cmake/examples/CTestScript.cmake +++ b/config/cmake/examples/CTestScript.cmake @@ -73,7 +73,7 @@ if (APPLE) set (ENV{CC} "${XCODE_CC}") set (ENV{CXX} "${XCODE_CXX}") - set (BUILD_OPTIONS "${BUILD_OPTIONS} -DCTEST_USE_LAUNCHERS:BOOL=ON -DCMAKE_BUILD_WITH_INSTALL_RPATH:BOOL=OFF") + set (BUILD_OPTIONS "${BUILD_OPTIONS} -DCTEST_USE_LAUNCHERS:BOOL=ON") endif () #----------------------------------------------------------------------------- diff --git a/config/cmake/scripts/CTestScript.cmake b/config/cmake/scripts/CTestScript.cmake index 7861c5d69f0..f87b3357c52 100644 --- a/config/cmake/scripts/CTestScript.cmake +++ b/config/cmake/scripts/CTestScript.cmake @@ -73,7 +73,7 @@ if (APPLE) set (ENV{CC} "${XCODE_CC}") set (ENV{CXX} "${XCODE_CXX}") - set (BUILD_OPTIONS "${BUILD_OPTIONS} -DCTEST_USE_LAUNCHERS:BOOL=ON -DCMAKE_BUILD_WITH_INSTALL_RPATH:BOOL=OFF") + set (BUILD_OPTIONS "${BUILD_OPTIONS} -DCTEST_USE_LAUNCHERS:BOOL=ON") endif () #----------------------------------------------------------------------------- diff --git a/release_docs/INSTALL_CMake.txt b/release_docs/INSTALL_CMake.txt index d9a0cc2e321..e902eb416a1 100644 --- a/release_docs/INSTALL_CMake.txt +++ b/release_docs/INSTALL_CMake.txt @@ -380,7 +380,6 @@ IV. Further considerations Additional options: CMAKE_ANSI_CFLAGS:STRING=-fPIC CTEST_USE_LAUNCHERS:BOOL=ON - CMAKE_BUILD_WITH_INSTALL_RPATH:BOOL=OFF 5. Windows developers should install NSIS or WiX to create an install image with CPack. Visual Studio Express users will not be able to package HDF5 into