From 65816155c15a4e44faa936d2181ad15a96a8c6bd Mon Sep 17 00:00:00 2001 From: ahcorde Date: Wed, 4 Mar 2020 14:34:20 +0100 Subject: [PATCH 1/9] added rosidl_runtime c and cpp depencencies Signed-off-by: ahcorde --- rosidl_generator_py/CMakeLists.txt | 7 +++++++ rosidl_generator_py/package.xml | 2 ++ 2 files changed, 9 insertions(+) diff --git a/rosidl_generator_py/CMakeLists.txt b/rosidl_generator_py/CMakeLists.txt index 78e5267e..6ac4b2cc 100644 --- a/rosidl_generator_py/CMakeLists.txt +++ b/rosidl_generator_py/CMakeLists.txt @@ -18,6 +18,8 @@ if(BUILD_TESTING) find_package(rmw REQUIRED) find_package(rosidl_cmake REQUIRED) find_package(rosidl_generator_c REQUIRED) + find_package(rosidl_runtime_c REQUIRED) + find_package(rosidl_runtime_cpp REQUIRED) find_package(ament_lint_auto REQUIRED) ament_lint_auto_find_test_dependencies() @@ -27,6 +29,11 @@ if(BUILD_TESTING) include(cmake/register_py.cmake) include(cmake/rosidl_generator_py_get_typesupports.cmake) + include_directories(include + ${rosidl_runtime_c_INCLUDE_DIRS} + ${rosidl_runtime_cpp_INCLUDE_DIRS} + ) + # Trick ament_target_dependencies() into thinking this package has been found set(rosidl_generator_py_FOUND "1") set(rosidl_generator_py_DIR "${CMAKE_CURRENT_SOURCE_DIR}/cmake") diff --git a/rosidl_generator_py/package.xml b/rosidl_generator_py/package.xml index 280a93b7..d4d77319 100644 --- a/rosidl_generator_py/package.xml +++ b/rosidl_generator_py/package.xml @@ -20,6 +20,8 @@ rosidl_typesupport_c rosidl_typesupport_interface + rosidl_runtime_c + rosidl_runtime_cpp python3-numpy rmw_implementation From c78938c9c6f8a9d697546627c048d381151a0229 Mon Sep 17 00:00:00 2001 From: ahcorde Date: Wed, 4 Mar 2020 17:54:49 +0100 Subject: [PATCH 2/9] Removed rosidl_generator_c dependency Signed-off-by: ahcorde --- rosidl_generator_py/CMakeLists.txt | 1 - rosidl_generator_py/package.xml | 2 -- 2 files changed, 3 deletions(-) diff --git a/rosidl_generator_py/CMakeLists.txt b/rosidl_generator_py/CMakeLists.txt index 6ac4b2cc..2ef986e4 100644 --- a/rosidl_generator_py/CMakeLists.txt +++ b/rosidl_generator_py/CMakeLists.txt @@ -17,7 +17,6 @@ if(BUILD_TESTING) find_package(rmw REQUIRED) find_package(rosidl_cmake REQUIRED) - find_package(rosidl_generator_c REQUIRED) find_package(rosidl_runtime_c REQUIRED) find_package(rosidl_runtime_cpp REQUIRED) diff --git a/rosidl_generator_py/package.xml b/rosidl_generator_py/package.xml index d4d77319..01fae9db 100644 --- a/rosidl_generator_py/package.xml +++ b/rosidl_generator_py/package.xml @@ -26,7 +26,6 @@ python3-numpy rmw_implementation rmw_implementation_cmake - rosidl_generator_c rosidl_parser ament_cmake_pytest @@ -40,7 +39,6 @@ rmw_implementation rmw_implementation_cmake rosidl_cmake - rosidl_generator_c rosidl_parser rosidl_typesupport_c test_interface_files From 1c81b45cc5937cf5d646d0207ea3badbe0e42184 Mon Sep 17 00:00:00 2001 From: ahcorde Date: Fri, 6 Mar 2020 11:24:20 +0100 Subject: [PATCH 3/9] Fixed rosidl_runtime dependencies Signed-off-by: ahcorde --- rosidl_generator_py/CMakeLists.txt | 2 -- rosidl_generator_py/package.xml | 4 +--- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/rosidl_generator_py/CMakeLists.txt b/rosidl_generator_py/CMakeLists.txt index 2ef986e4..f48f3fda 100644 --- a/rosidl_generator_py/CMakeLists.txt +++ b/rosidl_generator_py/CMakeLists.txt @@ -18,7 +18,6 @@ if(BUILD_TESTING) find_package(rmw REQUIRED) find_package(rosidl_cmake REQUIRED) find_package(rosidl_runtime_c REQUIRED) - find_package(rosidl_runtime_cpp REQUIRED) find_package(ament_lint_auto REQUIRED) ament_lint_auto_find_test_dependencies() @@ -30,7 +29,6 @@ if(BUILD_TESTING) include_directories(include ${rosidl_runtime_c_INCLUDE_DIRS} - ${rosidl_runtime_cpp_INCLUDE_DIRS} ) # Trick ament_target_dependencies() into thinking this package has been found diff --git a/rosidl_generator_py/package.xml b/rosidl_generator_py/package.xml index 01fae9db..dd113c90 100644 --- a/rosidl_generator_py/package.xml +++ b/rosidl_generator_py/package.xml @@ -20,9 +20,6 @@ rosidl_typesupport_c rosidl_typesupport_interface - rosidl_runtime_c - rosidl_runtime_cpp - python3-numpy rmw_implementation rmw_implementation_cmake @@ -42,6 +39,7 @@ rosidl_parser rosidl_typesupport_c test_interface_files + rosidl_runtime_c rosidl_generator_packages From f180b5ecdaef186869d416394c0775705c1ec4a7 Mon Sep 17 00:00:00 2001 From: ahcorde Date: Thu, 12 Mar 2020 23:59:46 +0100 Subject: [PATCH 4/9] Fixed rosidl_runtime_c dependencies Signed-off-by: ahcorde --- rosidl_generator_py/CMakeLists.txt | 5 ----- .../cmake/rosidl_generator_py_generate_interfaces.cmake | 6 +++--- rosidl_generator_py/package.xml | 4 ++++ 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/rosidl_generator_py/CMakeLists.txt b/rosidl_generator_py/CMakeLists.txt index f48f3fda..082e5f5e 100644 --- a/rosidl_generator_py/CMakeLists.txt +++ b/rosidl_generator_py/CMakeLists.txt @@ -17,7 +17,6 @@ if(BUILD_TESTING) find_package(rmw REQUIRED) find_package(rosidl_cmake REQUIRED) - find_package(rosidl_runtime_c REQUIRED) find_package(ament_lint_auto REQUIRED) ament_lint_auto_find_test_dependencies() @@ -27,10 +26,6 @@ if(BUILD_TESTING) include(cmake/register_py.cmake) include(cmake/rosidl_generator_py_get_typesupports.cmake) - include_directories(include - ${rosidl_runtime_c_INCLUDE_DIRS} - ) - # Trick ament_target_dependencies() into thinking this package has been found set(rosidl_generator_py_FOUND "1") set(rosidl_generator_py_DIR "${CMAKE_CURRENT_SOURCE_DIR}/cmake") diff --git a/rosidl_generator_py/cmake/rosidl_generator_py_generate_interfaces.cmake b/rosidl_generator_py/cmake/rosidl_generator_py_generate_interfaces.cmake index dbb0999c..c1b3f8d6 100644 --- a/rosidl_generator_py/cmake/rosidl_generator_py_generate_interfaces.cmake +++ b/rosidl_generator_py/cmake/rosidl_generator_py_generate_interfaces.cmake @@ -14,7 +14,7 @@ find_package(rmw_implementation_cmake REQUIRED) find_package(rmw REQUIRED) -find_package(rosidl_generator_c REQUIRED) +find_package(rosidl_runtime_c REQUIRED) find_package(rosidl_typesupport_c REQUIRED) find_package(rosidl_typesupport_interface REQUIRED) @@ -264,7 +264,7 @@ foreach(_typesupport_impl ${_typesupport_impls}) ${rosidl_generate_interfaces_TARGET} rosidl_typesupport_c) ament_target_dependencies(${_target_name} - "rosidl_generator_c" + "rosidl_runtime_c" "rosidl_typesupport_c" "rosidl_typesupport_interface" ) @@ -278,7 +278,7 @@ foreach(_typesupport_impl ${_typesupport_impls}) ${rosidl_generate_interfaces_TARGET}__${_typesupport_impl} ) ament_target_dependencies(${_target_name} - "rosidl_generator_c" + "rosidl_runtime_c" "rosidl_generator_py" ) diff --git a/rosidl_generator_py/package.xml b/rosidl_generator_py/package.xml index dd113c90..2bc3d34f 100644 --- a/rosidl_generator_py/package.xml +++ b/rosidl_generator_py/package.xml @@ -9,6 +9,9 @@ Esteve Fernandez Mikael Arguedas + + rosidl_generator_c + ament_cmake rmw @@ -24,6 +27,7 @@ rmw_implementation rmw_implementation_cmake rosidl_parser + rosidl_generator_c ament_cmake_pytest ament_index_python From 79a0b4c91f6ae956274d0b741dcfe73de1cf3cdd Mon Sep 17 00:00:00 2001 From: ahcorde Date: Fri, 13 Mar 2020 00:02:45 +0100 Subject: [PATCH 5/9] Fixed rosidl_runtime_c dependencies Signed-off-by: ahcorde --- rosidl_generator_py/package.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rosidl_generator_py/package.xml b/rosidl_generator_py/package.xml index 2bc3d34f..6e35d13a 100644 --- a/rosidl_generator_py/package.xml +++ b/rosidl_generator_py/package.xml @@ -10,7 +10,7 @@ Mikael Arguedas - rosidl_generator_c + rosidl_runtime_c ament_cmake @@ -27,7 +27,7 @@ rmw_implementation rmw_implementation_cmake rosidl_parser - rosidl_generator_c + rosidl_runtime_c ament_cmake_pytest ament_index_python From e60791af43621203e5d237627adb6a74b5875c58 Mon Sep 17 00:00:00 2001 From: ahcorde Date: Fri, 13 Mar 2020 09:04:05 +0100 Subject: [PATCH 6/9] Removed rosidl_runtime_c from test_depend Signed-off-by: ahcorde --- rosidl_generator_py/package.xml | 2 -- 1 file changed, 2 deletions(-) diff --git a/rosidl_generator_py/package.xml b/rosidl_generator_py/package.xml index 6e35d13a..88b76d72 100644 --- a/rosidl_generator_py/package.xml +++ b/rosidl_generator_py/package.xml @@ -9,7 +9,6 @@ Esteve Fernandez Mikael Arguedas - rosidl_runtime_c ament_cmake @@ -43,7 +42,6 @@ rosidl_parser rosidl_typesupport_c test_interface_files - rosidl_runtime_c rosidl_generator_packages From dea8232a1e1a9b9c92d7c8b15dfcd2a215ae0a6f Mon Sep 17 00:00:00 2001 From: ahcorde Date: Mon, 30 Mar 2020 09:22:11 +0200 Subject: [PATCH 7/9] Added rosidl_generator_x to rosidl_generator_py Signed-off-by: ahcorde --- rosidl_generator_py/CMakeLists.txt | 2 ++ rosidl_generator_py/package.xml | 2 ++ 2 files changed, 4 insertions(+) diff --git a/rosidl_generator_py/CMakeLists.txt b/rosidl_generator_py/CMakeLists.txt index 082e5f5e..d35a66b6 100644 --- a/rosidl_generator_py/CMakeLists.txt +++ b/rosidl_generator_py/CMakeLists.txt @@ -17,6 +17,8 @@ if(BUILD_TESTING) find_package(rmw REQUIRED) find_package(rosidl_cmake REQUIRED) + find_package(rosidl_generator_c REQUIRED) + find_package(rosidl_generator_cpp REQUIRED) find_package(ament_lint_auto REQUIRED) ament_lint_auto_find_test_dependencies() diff --git a/rosidl_generator_py/package.xml b/rosidl_generator_py/package.xml index 88b76d72..ffd894b4 100644 --- a/rosidl_generator_py/package.xml +++ b/rosidl_generator_py/package.xml @@ -12,6 +12,8 @@ rosidl_runtime_c ament_cmake + rosidl_generator_c + rosidl_generator_cpp rmw From d5c17af6b6499716d441c6ff12a4c47ff000e99e Mon Sep 17 00:00:00 2001 From: ahcorde Date: Wed, 1 Apr 2020 12:26:29 +0200 Subject: [PATCH 8/9] removed rosidl_generator_x dependencies rosidl_typesupport provides all transitive dependencies Signed-off-by: ahcorde --- rosidl_generator_py/CMakeLists.txt | 2 -- rosidl_generator_py/package.xml | 2 -- 2 files changed, 4 deletions(-) diff --git a/rosidl_generator_py/CMakeLists.txt b/rosidl_generator_py/CMakeLists.txt index d35a66b6..082e5f5e 100644 --- a/rosidl_generator_py/CMakeLists.txt +++ b/rosidl_generator_py/CMakeLists.txt @@ -17,8 +17,6 @@ if(BUILD_TESTING) find_package(rmw REQUIRED) find_package(rosidl_cmake REQUIRED) - find_package(rosidl_generator_c REQUIRED) - find_package(rosidl_generator_cpp REQUIRED) find_package(ament_lint_auto REQUIRED) ament_lint_auto_find_test_dependencies() diff --git a/rosidl_generator_py/package.xml b/rosidl_generator_py/package.xml index ffd894b4..88b76d72 100644 --- a/rosidl_generator_py/package.xml +++ b/rosidl_generator_py/package.xml @@ -12,8 +12,6 @@ rosidl_runtime_c ament_cmake - rosidl_generator_c - rosidl_generator_cpp rmw From 614d373da1a31ed87cd39754def0e5b0158e0c7a Mon Sep 17 00:00:00 2001 From: ahcorde Date: Fri, 3 Apr 2020 14:41:13 +0200 Subject: [PATCH 9/9] Fixed rosidl_generator_py test Signed-off-by: ahcorde --- rosidl_generator_py/package.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/rosidl_generator_py/package.xml b/rosidl_generator_py/package.xml index 88b76d72..51aa78ed 100644 --- a/rosidl_generator_py/package.xml +++ b/rosidl_generator_py/package.xml @@ -39,6 +39,8 @@ rmw_implementation rmw_implementation_cmake rosidl_cmake + rosidl_generator_c + rosidl_generator_cpp rosidl_parser rosidl_typesupport_c test_interface_files