Skip to content

Commit 19f59ae

Browse files
srmainwaringJaeyoung-Lim
authored andcommitted
ros2: use recommended ament install destinations
Signed-off-by: Rhys Mainwaring <[email protected]>
1 parent 47cbef7 commit 19f59ae

File tree

1 file changed

+6
-14
lines changed

1 file changed

+6
-14
lines changed

CMakeLists.txt

Lines changed: 6 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ target_include_directories(${PROJECT_NAME}
4444
"$<INSTALL_INTERFACE:include/${PROJECT_NAME}>"
4545
)
4646

47-
target_link_libraries(${PROJECT_NAME} Eigen3::Eigen GDAL::GDAL)
47+
target_link_libraries(${PROJECT_NAME} PUBLIC Eigen3::Eigen GDAL::GDAL)
4848

4949
ament_target_dependencies(${PROJECT_NAME} PUBLIC
5050
grid_map_core
@@ -55,7 +55,7 @@ add_executable(test_tif_loader
5555
src/test_tif_loader.cpp
5656
)
5757

58-
target_link_libraries(test_tif_loader
58+
target_link_libraries(test_tif_loader PUBLIC
5959
${PROJECT_NAME}
6060
)
6161

@@ -69,26 +69,18 @@ install(
6969
TARGETS
7070
${PROJECT_NAME}
7171
EXPORT export_${PROJECT_NAME}
72-
ARCHIVE DESTINATION lib/${PROJECT_NAME}
73-
LIBRARY DESTINATION lib/${PROJECT_NAME}
74-
RUNTIME DESTINATION bin/${PROJECT_NAME}
72+
ARCHIVE DESTINATION lib
73+
LIBRARY DESTINATION lib
74+
RUNTIME DESTINATION bin
7575
)
7676

7777
ament_export_targets(export_${PROJECT_NAME} HAS_LIBRARY_TARGET)
7878
ament_export_dependencies(GDAL)
7979

80-
# NOTE: if RUNTIME DESTINATION is set to bin/${PROJECT_NAME} the executable
81-
# is not found by ros2 launch:
82-
#
83-
# Caught exception in launch (see debug for traceback): executable
84-
# 'test_tif_loader' not found on the libexec directory
85-
# '<ws_path>/ros2-aerial/install/grid_map_geo/lib/grid_map_geo'
8680
install(
8781
TARGETS
8882
test_tif_loader
89-
ARCHIVE DESTINATION lib/${PROJECT_NAME}
90-
LIBRARY DESTINATION lib/${PROJECT_NAME}
91-
RUNTIME DESTINATION lib/${PROJECT_NAME}
83+
DESTINATION lib/${PROJECT_NAME}
9284
)
9385

9486
install(DIRECTORY

0 commit comments

Comments
 (0)