From db2ec71555fbd3c39d797ee3734fef36a94b5701 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marco=20A=2E=20Guti=C3=A9rrez?= Date: Fri, 12 Nov 2021 23:24:52 +0800 Subject: [PATCH] making install location package specific (#60) Signed-off-by: Marco A. Gutierrez --- rmf_building_sim_gazebo_plugins/CMakeLists.txt | 4 ++-- rmf_building_sim_ignition_plugins/CMakeLists.txt | 4 ++-- rmf_robot_sim_gazebo_plugins/CMakeLists.txt | 4 ++-- rmf_robot_sim_ignition_plugins/CMakeLists.txt | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/rmf_building_sim_gazebo_plugins/CMakeLists.txt b/rmf_building_sim_gazebo_plugins/CMakeLists.txt index f2af375..49078da 100644 --- a/rmf_building_sim_gazebo_plugins/CMakeLists.txt +++ b/rmf_building_sim_gazebo_plugins/CMakeLists.txt @@ -154,8 +154,8 @@ target_include_directories(crowd_simulator install( TARGETS door lift toggle_floors toggle_charging thumbnail_generator crowd_simulator - LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} - ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} + LIBRARY DESTINATION lib/${PROJECT_NAME} + ARCHIVE DESTINATION lib/${PROJECT_NAME} ) ament_package() diff --git a/rmf_building_sim_ignition_plugins/CMakeLists.txt b/rmf_building_sim_ignition_plugins/CMakeLists.txt index a2d8033..0cbc60b 100644 --- a/rmf_building_sim_ignition_plugins/CMakeLists.txt +++ b/rmf_building_sim_ignition_plugins/CMakeLists.txt @@ -151,8 +151,8 @@ target_include_directories(toggle_charging install( TARGETS door lift crowd_simulator toggle_charging - LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} - ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} + LIBRARY DESTINATION lib/${PROJECT_NAME} + ARCHIVE DESTINATION lib/${PROJECT_NAME} ) ament_package() diff --git a/rmf_robot_sim_gazebo_plugins/CMakeLists.txt b/rmf_robot_sim_gazebo_plugins/CMakeLists.txt index 294c4c3..e5fa498 100644 --- a/rmf_robot_sim_gazebo_plugins/CMakeLists.txt +++ b/rmf_robot_sim_gazebo_plugins/CMakeLists.txt @@ -130,8 +130,8 @@ install( teleport_ingestor readonly slotcar - LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} - ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} + LIBRARY DESTINATION lib/${PROJECT_NAME} + ARCHIVE DESTINATION lib/${PROJECT_NAME} ) ament_package() diff --git a/rmf_robot_sim_ignition_plugins/CMakeLists.txt b/rmf_robot_sim_ignition_plugins/CMakeLists.txt index aa7798e..15334ab 100644 --- a/rmf_robot_sim_ignition_plugins/CMakeLists.txt +++ b/rmf_robot_sim_ignition_plugins/CMakeLists.txt @@ -192,8 +192,8 @@ install( readonly slotcar LightTuning - LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} - ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} + LIBRARY DESTINATION lib/${PROJECT_NAME} + ARCHIVE DESTINATION lib/${PROJECT_NAME} ) ament_package()