From 2feec38c1a20b3db408ef70f9a82614c0079fb5b Mon Sep 17 00:00:00 2001 From: Ryan Friedman Date: Thu, 6 Mar 2025 16:45:24 -0800 Subject: [PATCH] Specify rosidl version dependency Signed-off-by: Ryan Friedman --- rosidl_generator_tests/CMakeLists.txt | 10 +++++----- rosidl_runtime_c/CMakeLists.txt | 2 +- rosidl_runtime_cpp/CMakeLists.txt | 2 +- rosidl_typesupport_introspection_cpp/CMakeLists.txt | 4 ++-- .../CMakeLists.txt | 12 ++++++------ 5 files changed, 15 insertions(+), 15 deletions(-) diff --git a/rosidl_generator_tests/CMakeLists.txt b/rosidl_generator_tests/CMakeLists.txt index b2b5d13fd..5f5e1a60b 100644 --- a/rosidl_generator_tests/CMakeLists.txt +++ b/rosidl_generator_tests/CMakeLists.txt @@ -21,11 +21,11 @@ if(BUILD_TESTING) find_package(ament_cmake_gtest REQUIRED) find_package(ament_cmake_pytest REQUIRED) find_package(ament_lint_auto REQUIRED) - find_package(rosidl_cmake REQUIRED) - find_package(rosidl_generator_cpp REQUIRED) - find_package(rosidl_generator_type_description REQUIRED) - find_package(rosidl_runtime_c REQUIRED) - find_package(rosidl_runtime_cpp REQUIRED) + find_package(rosidl_cmake 4 REQUIRED) + find_package(rosidl_generator_cpp 4 REQUIRED) + find_package(rosidl_generator_type_description 4 REQUIRED) + find_package(rosidl_runtime_c 4 REQUIRED) + find_package(rosidl_runtime_cpp 4 REQUIRED) find_package(test_interface_files REQUIRED) find_package(type_description_interfaces REQUIRED) ament_lint_auto_find_test_dependencies() diff --git a/rosidl_runtime_c/CMakeLists.txt b/rosidl_runtime_c/CMakeLists.txt index 825a026ce..77ecd9fb0 100644 --- a/rosidl_runtime_c/CMakeLists.txt +++ b/rosidl_runtime_c/CMakeLists.txt @@ -19,7 +19,7 @@ endif() find_package(ament_cmake_ros REQUIRED) find_package(rcutils REQUIRED) -find_package(rosidl_typesupport_interface REQUIRED) +find_package(rosidl_typesupport_interface 4 REQUIRED) file(GLOB type_description_sources "src/type_description/*.c") file(GLOB type_description_includes "include/rosidl_runtime_c/type_description/*.h") diff --git a/rosidl_runtime_cpp/CMakeLists.txt b/rosidl_runtime_cpp/CMakeLists.txt index ebc7d2563..36d11692c 100644 --- a/rosidl_runtime_cpp/CMakeLists.txt +++ b/rosidl_runtime_cpp/CMakeLists.txt @@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 3.5) project(rosidl_runtime_cpp) find_package(ament_cmake REQUIRED) -find_package(rosidl_runtime_c REQUIRED) +find_package(rosidl_runtime_c 4 REQUIRED) add_library(${PROJECT_NAME} INTERFACE) target_include_directories(${PROJECT_NAME} INTERFACE diff --git a/rosidl_typesupport_introspection_cpp/CMakeLists.txt b/rosidl_typesupport_introspection_cpp/CMakeLists.txt index 763f362d6..d197ce395 100644 --- a/rosidl_typesupport_introspection_cpp/CMakeLists.txt +++ b/rosidl_typesupport_introspection_cpp/CMakeLists.txt @@ -13,8 +13,8 @@ endif() find_package(ament_cmake_python REQUIRED) find_package(ament_cmake_ros REQUIRED) -find_package(rosidl_runtime_cpp REQUIRED) -find_package(rosidl_typesupport_introspection_c REQUIRED) +find_package(rosidl_runtime_cpp 4 REQUIRED) +find_package(rosidl_typesupport_introspection_c 4 REQUIRED) ament_export_dependencies(rosidl_runtime_cpp rosidl_typesupport_introspection_c) diff --git a/rosidl_typesupport_introspection_tests/CMakeLists.txt b/rosidl_typesupport_introspection_tests/CMakeLists.txt index a4b3b2313..c9aa666a6 100644 --- a/rosidl_typesupport_introspection_tests/CMakeLists.txt +++ b/rosidl_typesupport_introspection_tests/CMakeLists.txt @@ -22,11 +22,11 @@ if(BUILD_TESTING) add_compile_options(-Wno-gnu-zero-variadic-macro-arguments) endif() - find_package(rosidl_cmake REQUIRED) - find_package(rosidl_generator_c REQUIRED) - find_package(rosidl_generator_cpp REQUIRED) - find_package(rosidl_typesupport_introspection_c REQUIRED) - find_package(rosidl_typesupport_introspection_cpp REQUIRED) + find_package(rosidl_cmake 4 REQUIRED) + find_package(rosidl_generator_c 4 REQUIRED) + find_package(rosidl_generator_cpp 4 REQUIRED) + find_package(rosidl_typesupport_introspection_c 4 REQUIRED) + find_package(rosidl_typesupport_introspection_cpp 4 REQUIRED) find_package(test_interface_files REQUIRED) # Drop BoundedPlainSequences as BoundedSequences @@ -43,7 +43,7 @@ if(BUILD_TESTING) find_package(rcutils REQUIRED) find_package(rcpputils REQUIRED) - find_package(rosidl_typesupport_interface REQUIRED) + find_package(rosidl_typesupport_interface 4 REQUIRED) add_library(${PROJECT_NAME}_library INTERFACE) target_include_directories(${PROJECT_NAME}_library INTERFACE include/)