Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

standardize cmake #79

Merged
merged 5 commits into from
Sep 29, 2022
Merged

standardize cmake #79

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b3ce39d
Remove superfluous call in cmake
tylerjw Sep 29, 2022
9424f41
Buildtool export depend on python package
tylerjw Sep 29, 2022
831cc06
Use package name instead of variable
tylerjw Sep 29, 2022
b40a247
Standardize CMake in example
tylerjw Sep 29, 2022
c0aa5ba
parameter_traits HAS_LIBRARY_TARGE
tylerjw Sep 29, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 21 additions & 16 deletions example/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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)
Expand Down Expand Up @@ -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
Expand All @@ -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()
2 changes: 1 addition & 1 deletion generate_parameter_library/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ find_package(ament_cmake REQUIRED)

install(
DIRECTORY cmake
DESTINATION share/${PROJECT_NAME}
DESTINATION share/generate_parameter_library
)

if(BUILD_TESTING)
Expand Down
3 changes: 2 additions & 1 deletion generate_parameter_library/package.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,9 @@

<buildtool_depend>ament_cmake</buildtool_depend>

<buildtool_export_depend>generate_parameter_library_py</buildtool_export_depend>

<depend>fmt</depend>
<depend>generate_parameter_library_py</depend>
<depend>parameter_traits</depend>
<depend>rclcpp</depend>
<depend>rclcpp_lifecycle</depend>
Expand Down
31 changes: 16 additions & 15 deletions parameter_traits/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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 HAS_LIBRARY_TARGET)
ament_export_dependencies(fmt rclcpp tcb_span)
ament_package()