From 71475dbd7b4dca0cab3892102c1678acca3bd891 Mon Sep 17 00:00:00 2001 From: Dave Coleman Date: Thu, 27 Jul 2017 20:45:27 -0600 Subject: [PATCH 1/2] Improve install files in CMake --- CMakeLists.txt | 31 +++++++++++++++++++++---------- rrbot_control/CMakeLists.txt | 12 ++++++++++++ 2 files changed, 33 insertions(+), 10 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 9713753..8491623 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -138,29 +138,40 @@ target_link_libraries(${PROJECT_NAME}_keyboard_teleop add_subdirectory(rrbot_control) -## Install ------------------------------------------------------------ +############# +## Install ## +############# -# Install libraries +## Mark executables and/or libraries for installation install(TARGETS generic_hw_control_loop generic_hw_interface sim_hw_interface controller_to_csv csv_to_controller - LIBRARY DESTINATION - ${CATKIN_PACKAGE_LIB_DESTINATION} -) - -# Install executables -install(TARGETS ${PROJECT_NAME}_sim_hw_main ${PROJECT_NAME}_test_trajectory ${PROJECT_NAME}_controller_to_csv_main ${PROJECT_NAME}_csv_to_controller_main ${PROJECT_NAME}_keyboard_teleop + ARCHIVE DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION} LIBRARY DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION} RUNTIME DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION} ) -# Install header files -install(DIRECTORY include/${PROJECT_NAME}/ DESTINATION ${CATKIN_PACKAGE_INCLUDE_DESTINATION}) +# Mark cpp header files for installation +install(DIRECTORY include/${PROJECT_NAME}/ + DESTINATION ${CATKIN_PACKAGE_INCLUDE_DESTINATION} +) + +# Mark roslaunch files for installation +install(DIRECTORY launch + DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION} +) + +# Mark config files for installation +install(FILES + config + FILES_MATCHING PATTERN "*.yaml" + DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION} +) \ No newline at end of file diff --git a/rrbot_control/CMakeLists.txt b/rrbot_control/CMakeLists.txt index b361b90..f4e0be5 100644 --- a/rrbot_control/CMakeLists.txt +++ b/rrbot_control/CMakeLists.txt @@ -37,3 +37,15 @@ install(TARGETS # Install header files install(DIRECTORY include/rrbot_control/ DESTINATION ${CATKIN_PACKAGE_INCLUDE_DESTINATION}) + +# Mark roslaunch files for installation +install(DIRECTORY launch + DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION} +) + +# Mark config files for installation +install(FILES + config + FILES_MATCHING PATTERN "*.yaml" + DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION} +) \ No newline at end of file From bfab3fc140e091724a2b2f544bea4a0f4d8d1bbd Mon Sep 17 00:00:00 2001 From: AndyZe Date: Thu, 16 Jul 2020 11:12:59 -0500 Subject: [PATCH 2/2] Remove unnecessary installation instructions --- CMakeLists.txt | 12 ------------ rrbot_control/CMakeLists.txt | 7 ------- 2 files changed, 19 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 8491623..520a0ed 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -163,15 +163,3 @@ install(TARGETS install(DIRECTORY include/${PROJECT_NAME}/ DESTINATION ${CATKIN_PACKAGE_INCLUDE_DESTINATION} ) - -# Mark roslaunch files for installation -install(DIRECTORY launch - DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION} -) - -# Mark config files for installation -install(FILES - config - FILES_MATCHING PATTERN "*.yaml" - DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION} -) \ No newline at end of file diff --git a/rrbot_control/CMakeLists.txt b/rrbot_control/CMakeLists.txt index f4e0be5..03b6c22 100644 --- a/rrbot_control/CMakeLists.txt +++ b/rrbot_control/CMakeLists.txt @@ -42,10 +42,3 @@ install(DIRECTORY include/rrbot_control/ DESTINATION ${CATKIN_PACKAGE_INCLUDE_ install(DIRECTORY launch DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION} ) - -# Mark config files for installation -install(FILES - config - FILES_MATCHING PATTERN "*.yaml" - DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION} -) \ No newline at end of file