Skip to content

Commit 0613386

Browse files
authored
Switch to ament_cmake_ros_core package (#166)
Signed-off-by: Scott K Logan <[email protected]>
1 parent f4f9f02 commit 0613386

File tree

4 files changed

+12
-4
lines changed

4 files changed

+12
-4
lines changed

rosidl_typesupport_c/CMakeLists.txt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "Clang")
1616
add_compile_options(-Wall -Wextra -Wpedantic)
1717
endif()
1818

19-
find_package(ament_cmake_ros REQUIRED)
19+
find_package(ament_cmake_ros_core REQUIRED)
2020
find_package(rcpputils REQUIRED)
2121
find_package(rcutils REQUIRED)
2222
find_package(rosidl_runtime_c REQUIRED)
@@ -83,6 +83,8 @@ if(BUILD_TESTING)
8383
$<TARGET_FILE:rosidl_typesupport_c__test_type_support2>
8484
${TEST_LIB_DIR})
8585

86+
find_package(ament_cmake_gtest REQUIRED)
87+
8688
ament_add_gtest(test_message_type_support test/test_message_type_support_dispatch.cpp
8789
APPEND_ENV
8890
"DYLD_LIBRARY_PATH=${TEST_LIB_DIR}"

rosidl_typesupport_c/package.xml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<author email="[email protected]">Chris Lalancette</author>
1414
<author email="[email protected]">Dirk Thomas</author>
1515

16-
<buildtool_depend>ament_cmake_ros</buildtool_depend>
16+
<buildtool_depend>ament_cmake_ros_core</buildtool_depend>
1717

1818
<buildtool_export_depend>python3</buildtool_export_depend>
1919

@@ -34,6 +34,8 @@
3434
<exec_depend>rosidl_pycommon</exec_depend>
3535
<exec_depend>rosidl_typesupport_interface</exec_depend>
3636

37+
<test_depend>ament_cmake_gtest</test_depend>
38+
<test_depend>ament_cmake_pytest</test_depend>
3739
<test_depend>ament_lint_auto</test_depend>
3840
<test_depend>ament_lint_common</test_depend>
3941
<test_depend>mimick_vendor</test_depend>

rosidl_typesupport_cpp/CMakeLists.txt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "Clang")
1212
add_compile_options(-Wall -Wextra -Wpedantic)
1313
endif()
1414

15-
find_package(ament_cmake_ros REQUIRED)
15+
find_package(ament_cmake_ros_core REQUIRED)
1616
find_package(rcutils REQUIRED)
1717
find_package(rcpputils REQUIRED)
1818
find_package(rosidl_runtime_c REQUIRED)
@@ -81,6 +81,8 @@ if(BUILD_TESTING)
8181
$<TARGET_FILE:rosidl_typesupport_cpp__test_type_support2>
8282
${TEST_LIB_DIR})
8383

84+
find_package(ament_cmake_gtest REQUIRED)
85+
8486
ament_add_gtest(test_message_type_support test/test_message_type_support_dispatch.cpp
8587
APPEND_ENV
8688
"DYLD_LIBRARY_PATH=${TEST_LIB_DIR}"

rosidl_typesupport_cpp/package.xml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<author email="[email protected]">Chris Lalancette</author>
1414
<author email="[email protected]">Dirk Thomas</author>
1515

16-
<buildtool_depend>ament_cmake_ros</buildtool_depend>
16+
<buildtool_depend>ament_cmake_ros_core</buildtool_depend>
1717

1818
<buildtool_export_depend>python3</buildtool_export_depend>
1919

@@ -37,6 +37,8 @@
3737
<exec_depend>rosidl_pycommon</exec_depend>
3838
<exec_depend>rosidl_typesupport_interface</exec_depend>
3939

40+
<test_depend>ament_cmake_gtest</test_depend>
41+
<test_depend>ament_cmake_pytest</test_depend>
4042
<test_depend>ament_lint_auto</test_depend>
4143
<test_depend>ament_lint_common</test_depend>
4244
<test_depend>performance_test_fixture</test_depend>

0 commit comments

Comments
 (0)