Skip to content

Commit 5ee666a

Browse files
authored
Merge pull request #475 from humanoid-path-planner/osx-rpath
fix RPATH for OSX
2 parents 3374066 + 6c5c5be commit 5ee666a

File tree

2 files changed

+7
-3
lines changed

2 files changed

+7
-3
lines changed

CMakeLists.txt

+3-2
Original file line numberDiff line numberDiff line change
@@ -138,17 +138,18 @@ if(octomap_FOUND)
138138
list(GET VERSION_LIST 0 OCTOMAP_MAJOR_VERSION)
139139
list(GET VERSION_LIST 1 OCTOMAP_MINOR_VERSION)
140140
list(GET VERSION_LIST 2 OCTOMAP_PATCH_VERSION)
141-
message(STATUS "FCL uses Octomap")
141+
message(STATUS "HPP-FCL uses Octomap")
142142
else()
143143
SET(HPP_FCL_HAS_OCTOMAP FALSE)
144-
message(STATUS "FCL does not use Octomap")
144+
message(STATUS "HPP-FCL does not use Octomap")
145145
endif()
146146

147147
option(HPP_FCL_HAS_QHULL "use qhull library to compute convex hulls." FALSE)
148148
if(HPP_FCL_HAS_QHULL)
149149
find_package(Qhull COMPONENTS qhull_r qhullcpp)
150150
if(Qhull_FOUND)
151151
set(HPP_FCL_USE_SYSTEM_QHULL TRUE)
152+
message(STATUS "HPP-FCL uses system Qhull")
152153
else()
153154
message(STATUS "Qhullcpp not found: it will be build from sources, if Qhull_r is found")
154155
file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/third-parties)

src/CMakeLists.txt

+4-1
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,10 @@ add_library(${LIBRARY_NAME}
173173
${${LIBRARY_NAME}_SOURCES}
174174
)
175175

176-
set_target_properties(${PROJECT_NAME} PROPERTIES INSTALL_RPATH "\$ORIGIN")
176+
if(UNIX)
177+
get_relative_rpath(${CMAKE_INSTALL_FULL_LIBDIR} ${PROJECT_NAME}_INSTALL_RPATH)
178+
set_target_properties(${PROJECT_NAME} PROPERTIES INSTALL_RPATH "${${PROJECT_NAME}_INSTALL_RPATH}")
179+
endif()
177180

178181
# IDE sources and headers sorting
179182
ADD_SOURCE_GROUP(${LIBRARY_NAME}_SOURCES)

0 commit comments

Comments
 (0)