From a67ff1ea7821e26f1e381bca853c508b92e1d8f0 Mon Sep 17 00:00:00 2001 From: Levi Armstrong Date: Mon, 10 Jun 2024 21:24:00 -0500 Subject: [PATCH] Upgrade ros_industrial_cmake_boilerplate to version 0.6.0 --- CMakeLists.txt | 9 ++++++++- acm/CMakeLists.txt | 6 ++++++ collision/CMakeLists.txt | 6 ++++++ command_language/CMakeLists.txt | 6 ++++++ common/CMakeLists.txt | 2 ++ environment/CMakeLists.txt | 6 ++++++ joint_state_slider/CMakeLists.txt | 2 ++ joint_trajectory/CMakeLists.txt | 6 ++++++ kinematic_groups/CMakeLists.txt | 6 ++++++ manipulation/CMakeLists.txt | 2 ++ planning/CMakeLists.txt | 2 ++ plot/CMakeLists.txt | 2 ++ rendering/CMakeLists.txt | 6 ++++++ scene_graph/CMakeLists.txt | 6 ++++++ srdf/CMakeLists.txt | 2 ++ studio/CMakeLists.txt | 8 ++++++++ tool_path/CMakeLists.txt | 6 ++++++ workbench/CMakeLists.txt | 2 ++ 18 files changed, 84 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 66421851..690c5370 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -14,6 +14,8 @@ endif() option(BUILD_RENDERING "Build the rendering module" ON) option(BUILD_STUDIO "Build the studio module" ON) +set(PROJECT_TARGETS) + add_subdirectory(common) add_subdirectory(acm) add_subdirectory(collision) @@ -65,4 +67,9 @@ endif() install(FILES "${CMAKE_CURRENT_LIST_DIR}/cmake/FindQwt.cmake" "${CMAKE_CURRENT_LIST_DIR}/cmake/FindGraphviz.cmake" DESTINATION lib/cmake/${PROJECT_NAME}) -configure_package(NAMESPACE tesseract DEPENDENCIES ${DEPS} CFG_EXTRAS cmake/tesseract_qt-extras.cmake) +configure_package( + SKIP_INSTALL_TARGETS + NAMESPACE tesseract + TARGETS ${PROJECT_TARGETS} + DEPENDENCIES ${DEPS} + CFG_EXTRAS cmake/tesseract_qt-extras.cmake) diff --git a/acm/CMakeLists.txt b/acm/CMakeLists.txt index 9251a7cb..cb24682b 100644 --- a/acm/CMakeLists.txt +++ b/acm/CMakeLists.txt @@ -57,4 +57,10 @@ add_subdirectory(demo) install(DIRECTORY include/${PROJECT_NAME} DESTINATION include) # Install +list( + APPEND + PROJECT_TARGETS + ${PROJECT_NAME}_acm_models + ${PROJECT_NAME}_acm_widgets) +set(PROJECT_TARGETS ${PROJECT_TARGETS} PARENT_SCOPE) install_targets(TARGETS ${PROJECT_NAME}_acm_models ${PROJECT_NAME}_acm_widgets) diff --git a/collision/CMakeLists.txt b/collision/CMakeLists.txt index ec13f4ac..b2bbdd1e 100644 --- a/collision/CMakeLists.txt +++ b/collision/CMakeLists.txt @@ -57,4 +57,10 @@ target_include_directories( install(DIRECTORY include/${PROJECT_NAME} DESTINATION include) # Install +list( + APPEND + PROJECT_TARGETS + ${PROJECT_NAME}_collision_models + ${PROJECT_NAME}_collision_widgets) +set(PROJECT_TARGETS ${PROJECT_TARGETS} PARENT_SCOPE) install_targets(TARGETS ${PROJECT_NAME}_collision_models ${PROJECT_NAME}_collision_widgets) diff --git a/command_language/CMakeLists.txt b/command_language/CMakeLists.txt index 5b796548..a3b0a615 100644 --- a/command_language/CMakeLists.txt +++ b/command_language/CMakeLists.txt @@ -64,4 +64,10 @@ add_subdirectory(demo) install(DIRECTORY include/${PROJECT_NAME} DESTINATION include) # Install +list( + APPEND + PROJECT_TARGETS + ${PROJECT_NAME}_command_language_models + ${PROJECT_NAME}_command_language_widgets) +set(PROJECT_TARGETS ${PROJECT_TARGETS} PARENT_SCOPE) install_targets(TARGETS ${PROJECT_NAME}_command_language_models ${PROJECT_NAME}_command_language_widgets) diff --git a/common/CMakeLists.txt b/common/CMakeLists.txt index 7155b91d..37c4777b 100644 --- a/common/CMakeLists.txt +++ b/common/CMakeLists.txt @@ -146,4 +146,6 @@ add_subdirectory(demo) install(DIRECTORY include/${PROJECT_NAME} DESTINATION include) # Install +list(APPEND PROJECT_TARGETS ${PROJECT_NAME}_common) +set(PROJECT_TARGETS ${PROJECT_TARGETS} PARENT_SCOPE) install_targets(TARGETS ${PROJECT_NAME}_common) diff --git a/environment/CMakeLists.txt b/environment/CMakeLists.txt index bb6c8b70..4093c7c3 100644 --- a/environment/CMakeLists.txt +++ b/environment/CMakeLists.txt @@ -84,4 +84,10 @@ add_subdirectory(demo) install(DIRECTORY include/${PROJECT_NAME} DESTINATION include) # Install +list( + APPEND + PROJECT_TARGETS + ${PROJECT_NAME}_environment_models + ${PROJECT_NAME}_environment_widgets) +set(PROJECT_TARGETS ${PROJECT_TARGETS} PARENT_SCOPE) install_targets(TARGETS ${PROJECT_NAME}_environment_models ${PROJECT_NAME}_environment_widgets) diff --git a/joint_state_slider/CMakeLists.txt b/joint_state_slider/CMakeLists.txt index 3a86a79d..37851cce 100644 --- a/joint_state_slider/CMakeLists.txt +++ b/joint_state_slider/CMakeLists.txt @@ -29,4 +29,6 @@ add_subdirectory(demo) install(DIRECTORY include/${PROJECT_NAME} DESTINATION include) # Install +list(APPEND PROJECT_TARGETS ${PROJECT_NAME}_joint_state_slider) +set(PROJECT_TARGETS ${PROJECT_TARGETS} PARENT_SCOPE) install_targets(TARGETS ${PROJECT_NAME}_joint_state_slider) diff --git a/joint_trajectory/CMakeLists.txt b/joint_trajectory/CMakeLists.txt index e84c7c11..ca028221 100644 --- a/joint_trajectory/CMakeLists.txt +++ b/joint_trajectory/CMakeLists.txt @@ -64,4 +64,10 @@ add_subdirectory(demo) install(DIRECTORY include/${PROJECT_NAME} DESTINATION include) # Install +list( + APPEND + PROJECT_TARGETS + ${PROJECT_NAME}_joint_trajectory_models + ${PROJECT_NAME}_joint_trajectory_widgets) +set(PROJECT_TARGETS ${PROJECT_TARGETS} PARENT_SCOPE) install_targets(TARGETS ${PROJECT_NAME}_joint_trajectory_models ${PROJECT_NAME}_joint_trajectory_widgets) diff --git a/kinematic_groups/CMakeLists.txt b/kinematic_groups/CMakeLists.txt index 032e7361..55028f2f 100644 --- a/kinematic_groups/CMakeLists.txt +++ b/kinematic_groups/CMakeLists.txt @@ -76,4 +76,10 @@ add_subdirectory(demo) install(DIRECTORY include/${PROJECT_NAME} DESTINATION include) # Install +list( + APPEND + PROJECT_TARGETS + ${PROJECT_NAME}_kinematic_groups_models + ${PROJECT_NAME}_kinematic_groups_widgets) +set(PROJECT_TARGETS ${PROJECT_TARGETS} PARENT_SCOPE) install_targets(TARGETS ${PROJECT_NAME}_kinematic_groups_models ${PROJECT_NAME}_kinematic_groups_widgets) diff --git a/manipulation/CMakeLists.txt b/manipulation/CMakeLists.txt index 6100285d..1a63ecdb 100644 --- a/manipulation/CMakeLists.txt +++ b/manipulation/CMakeLists.txt @@ -39,4 +39,6 @@ target_include_directories( install(DIRECTORY include/${PROJECT_NAME} DESTINATION include) # Install +list(APPEND PROJECT_TARGETS ${PROJECT_NAME}_manipulation_widgets) +set(PROJECT_TARGETS ${PROJECT_TARGETS} PARENT_SCOPE) install_targets(TARGETS ${PROJECT_NAME}_manipulation_widgets) diff --git a/planning/CMakeLists.txt b/planning/CMakeLists.txt index 6473d518..fa3066fe 100644 --- a/planning/CMakeLists.txt +++ b/planning/CMakeLists.txt @@ -43,4 +43,6 @@ target_include_directories( install(DIRECTORY include/${PROJECT_NAME} DESTINATION include) # Install +list(APPEND PROJECT_TARGETS ${PROJECT_NAME}_planning) +set(PROJECT_TARGETS ${PROJECT_TARGETS} PARENT_SCOPE) install_targets(TARGETS ${PROJECT_NAME}_planning) diff --git a/plot/CMakeLists.txt b/plot/CMakeLists.txt index ac3cbf3b..0f4a8649 100644 --- a/plot/CMakeLists.txt +++ b/plot/CMakeLists.txt @@ -81,4 +81,6 @@ add_subdirectory(demo) # Mark cpp header files for installation install(DIRECTORY include/${PROJECT_NAME} DESTINATION include) +list(APPEND PROJECT_TARGETS ${PROJECT_NAME}_plot) +set(PROJECT_TARGETS ${PROJECT_TARGETS} PARENT_SCOPE) install_targets(TARGETS ${PROJECT_NAME}_plot) diff --git a/rendering/CMakeLists.txt b/rendering/CMakeLists.txt index 4cd32ed4..bdf548d1 100644 --- a/rendering/CMakeLists.txt +++ b/rendering/CMakeLists.txt @@ -70,4 +70,10 @@ add_subdirectory(demo) install(DIRECTORY include/${PROJECT_NAME} DESTINATION include) # Install +list( + APPEND + PROJECT_TARGETS + ${PROJECT_NAME}_gazebo_utils + ${PROJECT_NAME}_render_widgets) +set(PROJECT_TARGETS ${PROJECT_TARGETS} PARENT_SCOPE) install_targets(TARGETS ${PROJECT_NAME}_gazebo_utils ${PROJECT_NAME}_render_widgets) diff --git a/scene_graph/CMakeLists.txt b/scene_graph/CMakeLists.txt index 4d1e104a..c8af1621 100644 --- a/scene_graph/CMakeLists.txt +++ b/scene_graph/CMakeLists.txt @@ -79,4 +79,10 @@ add_subdirectory(demo) install(DIRECTORY include/${PROJECT_NAME} DESTINATION include) # Install +list( + APPEND + PROJECT_TARGETS + ${PROJECT_NAME}_scene_graph_models + ${PROJECT_NAME}_scene_graph_widgets) +set(PROJECT_TARGETS ${PROJECT_TARGETS} PARENT_SCOPE) install_targets(TARGETS ${PROJECT_NAME}_scene_graph_models ${PROJECT_NAME}_scene_graph_widgets) diff --git a/srdf/CMakeLists.txt b/srdf/CMakeLists.txt index 954637f3..7d90cc1f 100644 --- a/srdf/CMakeLists.txt +++ b/srdf/CMakeLists.txt @@ -39,4 +39,6 @@ endif() install(DIRECTORY include/${PROJECT_NAME} DESTINATION include) # Install +list(APPEND PROJECT_TARGETS ${SRDF_TARGETS}) +set(PROJECT_TARGETS ${PROJECT_TARGETS} PARENT_SCOPE) install_targets(TARGETS ${SRDF_TARGETS}) diff --git a/studio/CMakeLists.txt b/studio/CMakeLists.txt index d157e799..2a122771 100644 --- a/studio/CMakeLists.txt +++ b/studio/CMakeLists.txt @@ -164,6 +164,14 @@ foreach(dir config) endforeach() # Install +list( + APPEND + PROJECT_TARGETS + ${PROJECT_NAME}_studio + ${PROJECT_NAME}_studio_widgets + ${PROJECT_NAME}_studio_plugin_factory + ${PROJECT_NAME}_studio_plugins) +set(PROJECT_TARGETS ${PROJECT_TARGETS} PARENT_SCOPE) install_targets( TARGETS ${PROJECT_NAME}_studio diff --git a/tool_path/CMakeLists.txt b/tool_path/CMakeLists.txt index 9918d498..2fe8c03b 100644 --- a/tool_path/CMakeLists.txt +++ b/tool_path/CMakeLists.txt @@ -58,4 +58,10 @@ add_subdirectory(demo) install(DIRECTORY include/${PROJECT_NAME} DESTINATION include) # Install +list( + APPEND + PROJECT_TARGETS + ${PROJECT_NAME}_tool_path_models + ${PROJECT_NAME}_tool_path_widgets) +set(PROJECT_TARGETS ${PROJECT_TARGETS} PARENT_SCOPE) install_targets(TARGETS ${PROJECT_NAME}_tool_path_models ${PROJECT_NAME}_tool_path_widgets) diff --git a/workbench/CMakeLists.txt b/workbench/CMakeLists.txt index 8ae6c9a4..cd95c7c2 100644 --- a/workbench/CMakeLists.txt +++ b/workbench/CMakeLists.txt @@ -29,4 +29,6 @@ add_subdirectory(demo) install(DIRECTORY include/${PROJECT_NAME} DESTINATION include) # Install +list(APPEND PROJECT_TARGETS ${PROJECT_NAME}_workbench_widgets) +set(PROJECT_TARGETS ${PROJECT_TARGETS} PARENT_SCOPE) install_targets(TARGETS ${PROJECT_NAME}_workbench_widgets)