Skip to content

Commit

Permalink
Merge pull request #737 from /issues/733-cmake-osx-rpath
Browse files Browse the repository at this point in the history
In relation to #733, turn on @loader_path and @executable_path for rpath on OSX.
  • Loading branch information
hobu committed Feb 5, 2015
2 parents 2fade5c + 984318e commit 91a2647
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 1 deletion.
3 changes: 3 additions & 0 deletions CMakeLists.txt
Expand Up @@ -51,6 +51,9 @@ file(MAKE_DIRECTORY "${PDAL_OUTPUT_BIN_DIR}")
# per http://www.cmake.org/Wiki/CMake_RPATH_handling
SET(CMAKE_SKIP_BUILD_RPATH FALSE )
SET(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE)
if (APPLE)
SET(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE)
endif()
SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
IF (APPLE)
SET(MACOSX_RPATH ON)
Expand Down
6 changes: 6 additions & 0 deletions cmake/macros.cmake
Expand Up @@ -64,6 +64,9 @@ macro(PDAL_ADD_LIBRARY _name)
RUNTIME DESTINATION ${PDAL_BIN_INSTALL_DIR}
LIBRARY DESTINATION ${PDAL_LIB_INSTALL_DIR}
ARCHIVE DESTINATION ${PDAL_LIB_INSTALL_DIR})
if (APPLE)
set_target_properties(${_name} PROPERTIES INSTALL_NAME_DIR "@executable_path/../lib")
endif()
endmacro(PDAL_ADD_LIBRARY)

###############################################################################
Expand Down Expand Up @@ -114,6 +117,9 @@ macro(PDAL_ADD_PLUGIN _name _type _shortname)
RUNTIME DESTINATION ${PDAL_BIN_INSTALL_DIR}
LIBRARY DESTINATION ${PDAL_LIB_INSTALL_DIR}
ARCHIVE DESTINATION ${PDAL_LIB_INSTALL_DIR})
if (APPLE)
set_target_properties(${${_name}} PROPERTIES INSTALL_NAME_DIR "@loader_path/")
endif()
endmacro(PDAL_ADD_PLUGIN)

###############################################################################
Expand Down
2 changes: 1 addition & 1 deletion cmake/policies.cmake
Expand Up @@ -3,5 +3,5 @@
#
if (CMAKE_MAJOR_VERSION GREATER 2)
cmake_policy(SET CMP0022 OLD) # interface link libraries
cmake_policy(SET CMP0042 OLD) # osx rpath
cmake_policy(SET CMP0042 NEW) # osx rpath
endif()

0 comments on commit 91a2647

Please sign in to comment.