From b3ce39d3b2614059bc4ef01ab8326697b5ff564a Mon Sep 17 00:00:00 2001 From: Tyler Weaver Date: Thu, 29 Sep 2022 14:16:29 -0600 Subject: [PATCH 1/5] Remove superfluous call in cmake --- parameter_traits/CMakeLists.txt | 31 ++++++++++++++++--------------- 1 file changed, 16 insertions(+), 15 deletions(-) diff --git a/parameter_traits/CMakeLists.txt b/parameter_traits/CMakeLists.txt index 5a1a477..cba1ab7 100644 --- a/parameter_traits/CMakeLists.txt +++ b/parameter_traits/CMakeLists.txt @@ -19,21 +19,6 @@ target_link_libraries(parameter_traits tcb_span::tcb_span ) -install(DIRECTORY include/ DESTINATION include/) - -install( - TARGETS parameter_traits - EXPORT parameter_traits - LIBRARY DESTINATION lib - ARCHIVE DESTINATION lib - RUNTIME DESTINATION bin - INCLUDES DESTINATION include -) - -ament_export_include_directories(include) -ament_export_targets(parameter_traits) -ament_export_dependencies(fmt rclcpp tcb_span) - if(BUILD_TESTING) find_package(ament_lint_auto REQUIRED) # the following lines skip linters @@ -44,4 +29,20 @@ if(BUILD_TESTING) add_subdirectory(test) endif() +install( + DIRECTORY include/ + DESTINATION include +) + +install( + TARGETS parameter_traits + EXPORT export_parameter_traits + LIBRARY DESTINATION lib + ARCHIVE DESTINATION lib + RUNTIME DESTINATION bin + INCLUDES DESTINATION include +) + +ament_export_targets(export_parameter_traits) +ament_export_dependencies(fmt rclcpp tcb_span) ament_package() From 9424f4132d53f3a184ba7c3bfc97c2ed1b5fd8c2 Mon Sep 17 00:00:00 2001 From: Tyler Weaver Date: Thu, 29 Sep 2022 14:23:01 -0600 Subject: [PATCH 2/5] Buildtool export depend on python package --- generate_parameter_library/package.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/generate_parameter_library/package.xml b/generate_parameter_library/package.xml index 587294b..b305555 100644 --- a/generate_parameter_library/package.xml +++ b/generate_parameter_library/package.xml @@ -10,8 +10,9 @@ ament_cmake + generate_parameter_library_py + fmt - generate_parameter_library_py parameter_traits rclcpp rclcpp_lifecycle From 831cc06a62d41d69a07b7dd7dd948c5f79b507ba Mon Sep 17 00:00:00 2001 From: Tyler Weaver Date: Thu, 29 Sep 2022 14:24:36 -0600 Subject: [PATCH 3/5] Use package name instead of variable --- generate_parameter_library/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generate_parameter_library/CMakeLists.txt b/generate_parameter_library/CMakeLists.txt index d26dc71..efb4aad 100644 --- a/generate_parameter_library/CMakeLists.txt +++ b/generate_parameter_library/CMakeLists.txt @@ -6,7 +6,7 @@ find_package(ament_cmake REQUIRED) install( DIRECTORY cmake - DESTINATION share/${PROJECT_NAME} + DESTINATION share/generate_parameter_library ) if(BUILD_TESTING) From b40a24786f005455f9b6a6f8c176d3be25a40284 Mon Sep 17 00:00:00 2001 From: Tyler Weaver Date: Thu, 29 Sep 2022 14:29:32 -0600 Subject: [PATCH 4/5] Standardize CMake in example --- example/CMakeLists.txt | 37 +++++++++++++++++++++---------------- 1 file changed, 21 insertions(+), 16 deletions(-) diff --git a/example/CMakeLists.txt b/example/CMakeLists.txt index 91b5c1a..92bf9ca 100644 --- a/example/CMakeLists.txt +++ b/example/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.22) +cmake_minimum_required(VERSION 3.16) project(generate_parameter_library_example) find_package(ament_cmake REQUIRED) @@ -29,20 +29,6 @@ rclcpp_components_register_node(minimal_publisher EXECUTABLE test_node ) -install(DIRECTORY include/ DESTINATION include/) -install(TARGETS minimal_publisher admittance_controller_parameters - EXPORT generate_parameter_library_example_export - ARCHIVE DESTINATION lib - LIBRARY DESTINATION lib - RUNTIME DESTINATION bin - INCLUDES DESTINATION include -) - -install( - TARGETS test_node - DESTINATION lib/${PROJECT_NAME} -) - if(BUILD_TESTING) find_package(ament_lint_auto REQUIRED) set(ament_cmake_cpplint_FOUND TRUE) # Conflicts with clang-foramt @@ -63,5 +49,24 @@ if(BUILD_TESTING) target_link_libraries(test_example_gmock admittance_controller_parameters rclcpp::rclcpp) endif() -ament_export_targets(generate_parameter_library_example_export) +install( + DIRECTORY include/ + DESTINATION include +) + +install(TARGETS minimal_publisher admittance_controller_parameters + EXPORT export_generate_parameter_library_example + ARCHIVE DESTINATION lib + LIBRARY DESTINATION lib + RUNTIME DESTINATION bin + INCLUDES DESTINATION include +) + +install( + TARGETS test_node + DESTINATION lib/generate_parameter_library_example +) + +ament_export_targets(export_generate_parameter_library_example HAS_LIBRARY_TARGET) +ament_export_dependencies(rclcpp rclcpp_components) ament_package() From c0aa5ba39a41467d08a98f78d1fa1af20314f906 Mon Sep 17 00:00:00 2001 From: Tyler Weaver Date: Thu, 29 Sep 2022 14:30:04 -0600 Subject: [PATCH 5/5] parameter_traits HAS_LIBRARY_TARGE --- parameter_traits/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parameter_traits/CMakeLists.txt b/parameter_traits/CMakeLists.txt index cba1ab7..73889d7 100644 --- a/parameter_traits/CMakeLists.txt +++ b/parameter_traits/CMakeLists.txt @@ -43,6 +43,6 @@ install( INCLUDES DESTINATION include ) -ament_export_targets(export_parameter_traits) +ament_export_targets(export_parameter_traits HAS_LIBRARY_TARGET) ament_export_dependencies(fmt rclcpp tcb_span) ament_package()