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.

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

Specify rosidl version dependency in CMake #851

Open
wants to merge 1 commit into
base: rolling
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
10 changes: 5 additions & 5 deletions rosidl_generator_tests/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down
2 changes: 1 addition & 1 deletion rosidl_runtime_c/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
2 changes: 1 addition & 1 deletion rosidl_runtime_cpp/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions rosidl_typesupport_introspection_cpp/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
12 changes: 6 additions & 6 deletions rosidl_typesupport_introspection_tests/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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/)
Expand Down