Skip to content

Commit 14cd417

Browse files
committed
Fix librcs RPATH
1 parent c0e99a3 commit 14cd417

2 files changed

Lines changed: 17 additions & 10 deletions

File tree

cmake/Findpinocchio.cmake

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -46,19 +46,23 @@ if (NOT pinocchio_FOUND)
4646
# Create the imported target
4747
add_library(pinocchio::pinocchio SHARED IMPORTED)
4848
target_include_directories(pinocchio::pinocchio INTERFACE ${pinocchio_INCLUDE_DIRS})
49-
set_target_properties(
50-
pinocchio::pinocchio
51-
PROPERTIES
49+
set_target_properties(pinocchio::pinocchio
50+
PROPERTIES
5251
IMPORTED_LOCATION "${pinocchio_library_path}"
5352
)
54-
55-
add_library(pinocchio_parsers SHARED IMPORTED)
56-
target_include_directories(pinocchio_parsers INTERFACE ${pinocchio_INCLUDE_DIRS})
57-
set_target_properties(
58-
pinocchio_parsers
59-
PROPERTIES
53+
54+
add_library(pinocchio::parsers SHARED IMPORTED)
55+
target_include_directories(pinocchio::parsers INTERFACE ${pinocchio_INCLUDE_DIRS})
56+
set_target_properties(pinocchio::parsers
57+
PROPERTIES
6058
IMPORTED_LOCATION "${pinocchio_parsers_path}"
6159
)
60+
61+
add_library(pinocchio::all INTERFACE IMPORTED)
62+
set_target_properties(pinocchio::all
63+
PROPERTIES
64+
INTERFACE_LINK_LIBRARIES "pinocchio::pinocchio;pinocchio::parsers"
65+
)
6266
set(pinocchio_FOUND TRUE)
6367

6468
endif()

src/rcs/CMakeLists.txt

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
11
add_library(rcs SHARED)
22
target_include_directories(rcs PUBLIC ${CMAKE_SOURCE_DIR}/include)
33
target_sources(rcs PRIVATE Pose.cpp Robot.cpp IK.cpp utils.cpp)
4-
target_link_libraries(rcs PUBLIC Eigen3::Eigen mdl pinocchio::pinocchio pinocchio_parsers)
4+
target_link_libraries(rcs PUBLIC Eigen3::Eigen mdl pinocchio::all)
5+
set_target_properties(rcs PROPERTIES
6+
INSTALL_RPATH "$ORIGIN;$ORIGIN/../cmeel.prefix/lib"
7+
)

0 commit comments

Comments
 (0)