Skip to content
Snippets Groups Projects
Unverified Commit 5ee666ad authored by Justin Carpentier's avatar Justin Carpentier Committed by GitHub
Browse files

Merge pull request #475 from humanoid-path-planner/osx-rpath

fix RPATH for OSX
parents 3374066f 6c5c5be1
No related branches found
No related tags found
No related merge requests found
Pipeline #33025 passed with warnings
......@@ -138,10 +138,10 @@ if(octomap_FOUND)
list(GET VERSION_LIST 0 OCTOMAP_MAJOR_VERSION)
list(GET VERSION_LIST 1 OCTOMAP_MINOR_VERSION)
list(GET VERSION_LIST 2 OCTOMAP_PATCH_VERSION)
message(STATUS "FCL uses Octomap")
message(STATUS "HPP-FCL uses Octomap")
else()
SET(HPP_FCL_HAS_OCTOMAP FALSE)
message(STATUS "FCL does not use Octomap")
message(STATUS "HPP-FCL does not use Octomap")
endif()
option(HPP_FCL_HAS_QHULL "use qhull library to compute convex hulls." FALSE)
......@@ -149,6 +149,7 @@ if(HPP_FCL_HAS_QHULL)
find_package(Qhull COMPONENTS qhull_r qhullcpp)
if(Qhull_FOUND)
set(HPP_FCL_USE_SYSTEM_QHULL TRUE)
message(STATUS "HPP-FCL uses system Qhull")
else()
message(STATUS "Qhullcpp not found: it will be build from sources, if Qhull_r is found")
file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/third-parties)
......
......@@ -173,7 +173,10 @@ add_library(${LIBRARY_NAME}
${${LIBRARY_NAME}_SOURCES}
)
set_target_properties(${PROJECT_NAME} PROPERTIES INSTALL_RPATH "\$ORIGIN")
if(UNIX)
get_relative_rpath(${CMAKE_INSTALL_FULL_LIBDIR} ${PROJECT_NAME}_INSTALL_RPATH)
set_target_properties(${PROJECT_NAME} PROPERTIES INSTALL_RPATH "${${PROJECT_NAME}_INSTALL_RPATH}")
endif()
# IDE sources and headers sorting
ADD_SOURCE_GROUP(${LIBRARY_NAME}_SOURCES)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment