From 981a57eb0de44294fed7747c0e49df9257deb820 Mon Sep 17 00:00:00 2001 From: Christoph Froehlich Date: Fri, 10 May 2024 07:14:34 +0000 Subject: [PATCH 1/2] Add find_package for ament_cmake_gen_version_h --- controller_interface/CMakeLists.txt | 1 + controller_manager/CMakeLists.txt | 1 + hardware_interface/CMakeLists.txt | 1 + joint_limits/CMakeLists.txt | 1 + transmission_interface/CMakeLists.txt | 1 + 5 files changed, 5 insertions(+) diff --git a/controller_interface/CMakeLists.txt b/controller_interface/CMakeLists.txt index 2b7ccb9203..3dc3bc4d0a 100644 --- a/controller_interface/CMakeLists.txt +++ b/controller_interface/CMakeLists.txt @@ -12,6 +12,7 @@ set(THIS_PACKAGE_INCLUDE_DEPENDS ) find_package(ament_cmake REQUIRED) +find_package(ament_cmake_gen_version_h REQUIRED) foreach(Dependency IN ITEMS ${THIS_PACKAGE_INCLUDE_DEPENDS}) find_package(${Dependency} REQUIRED) endforeach() diff --git a/controller_manager/CMakeLists.txt b/controller_manager/CMakeLists.txt index d99a7f7330..c3c0de7739 100644 --- a/controller_manager/CMakeLists.txt +++ b/controller_manager/CMakeLists.txt @@ -21,6 +21,7 @@ set(THIS_PACKAGE_INCLUDE_DEPENDS find_package(ament_cmake REQUIRED) find_package(ament_cmake_python REQUIRED) find_package(ament_cmake_core REQUIRED) +find_package(ament_cmake_gen_version_h REQUIRED) find_package(backward_ros REQUIRED) foreach(Dependency IN ITEMS ${THIS_PACKAGE_INCLUDE_DEPENDS}) find_package(${Dependency} REQUIRED) diff --git a/hardware_interface/CMakeLists.txt b/hardware_interface/CMakeLists.txt index a5debef3b7..c557a4970f 100644 --- a/hardware_interface/CMakeLists.txt +++ b/hardware_interface/CMakeLists.txt @@ -20,6 +20,7 @@ set(THIS_PACKAGE_INCLUDE_DEPENDS ) find_package(ament_cmake REQUIRED) +find_package(ament_cmake_gen_version_h REQUIRED) foreach(Dependency IN ITEMS ${THIS_PACKAGE_INCLUDE_DEPENDS}) find_package(${Dependency} REQUIRED) endforeach() diff --git a/joint_limits/CMakeLists.txt b/joint_limits/CMakeLists.txt index 1139a5248e..3e296cd584 100644 --- a/joint_limits/CMakeLists.txt +++ b/joint_limits/CMakeLists.txt @@ -13,6 +13,7 @@ set(THIS_PACKAGE_INCLUDE_DEPENDS ) find_package(ament_cmake REQUIRED) +find_package(ament_cmake_gen_version_h REQUIRED) foreach(Dependency IN ITEMS ${THIS_PACKAGE_INCLUDE_DEPENDS}) find_package(${Dependency} REQUIRED) endforeach() diff --git a/transmission_interface/CMakeLists.txt b/transmission_interface/CMakeLists.txt index 98dcdcd192..185fb32d3a 100644 --- a/transmission_interface/CMakeLists.txt +++ b/transmission_interface/CMakeLists.txt @@ -13,6 +13,7 @@ set(THIS_PACKAGE_INCLUDE_DEPENDS ) find_package(ament_cmake REQUIRED) +find_package(ament_cmake_gen_version_h REQUIRED) foreach(Dependency IN ITEMS ${THIS_PACKAGE_INCLUDE_DEPENDS}) find_package(${Dependency} REQUIRED) endforeach() From 132acab6468614d809ccb526f0b7d611c899dacb Mon Sep 17 00:00:00 2001 From: Christoph Froehlich Date: Fri, 10 May 2024 19:41:49 +0000 Subject: [PATCH 2/2] Remove ament_generate_version_header for joint_limits --- joint_limits/CMakeLists.txt | 3 ++- joint_limits/package.xml | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/joint_limits/CMakeLists.txt b/joint_limits/CMakeLists.txt index 3e296cd584..316a1ec7a2 100644 --- a/joint_limits/CMakeLists.txt +++ b/joint_limits/CMakeLists.txt @@ -62,4 +62,5 @@ install(TARGETS joint_limits ament_export_targets(export_joint_limits HAS_LIBRARY_TARGET) ament_export_dependencies(${THIS_PACKAGE_INCLUDE_DEPENDS}) ament_package() -ament_generate_version_header(${PROJECT_NAME}) +# TODO(anyone) uncomment if https://github.com/ament/ament_cmake/pull/526 is merged +# ament_generate_version_header(${PROJECT_NAME}) diff --git a/joint_limits/package.xml b/joint_limits/package.xml index d99ad61016..eba131c851 100644 --- a/joint_limits/package.xml +++ b/joint_limits/package.xml @@ -13,7 +13,8 @@ https://github.com/ros-controls/ros2_control ament_cmake - ament_cmake_gen_version_h + + rclcpp rclcpp_lifecycle