Skip to content

Commit 030766f

Browse files
committed
port cob_srvs
1 parent 5ae0566 commit 030766f

File tree

3 files changed

+39
-18
lines changed

3 files changed

+39
-18
lines changed

cob_srvs/CMakeLists.txt

Lines changed: 26 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,32 @@
1-
cmake_minimum_required(VERSION 3.0.2)
1+
cmake_minimum_required(VERSION 3.5)
22
project(cob_srvs)
33

4-
find_package(catkin REQUIRED COMPONENTS geometry_msgs message_generation)
4+
# Default to C99
5+
if(NOT CMAKE_C_STANDARD)
6+
set(CMAKE_C_STANDARD 99)
7+
endif()
58

6-
add_service_files(FILES
7-
Dock.srv
8-
SetFloat.srv
9-
SetInt.srv
10-
SetString.srv
11-
)
9+
# Default to C++14
10+
if(NOT CMAKE_CXX_STANDARD)
11+
set(CMAKE_CXX_STANDARD 14)
12+
endif()
1213

13-
generate_messages(
14-
DEPENDENCIES geometry_msgs
15-
)
14+
if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "Clang")
15+
add_compile_options(-Wall -Wextra -Wpedantic)
16+
endif()
17+
18+
find_package(ament_cmake REQUIRED)
19+
find_package(rosidl_default_generators REQUIRED)
1620

17-
catkin_package(
18-
CATKIN_DEPENDS geometry_msgs message_runtime
21+
set(srv_files
22+
"srv/SetFloat.srv"
23+
"srv/SetInt.srv"
24+
"srv/SetString.srv"
1925
)
26+
rosidl_generate_interfaces(${PROJECT_NAME}
27+
${srv_files}
28+
ADD_LINTER_TESTS
29+
)
30+
31+
ament_export_dependencies(rosidl_default_runtime)
32+
ament_package()

cob_srvs/COLCON_IGNORE

Whitespace-only changes.

cob_srvs/package.xml

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
<package format="2">
1+
<?xml version="1.0"?>
2+
<?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
3+
<package format="3">
24
<name>cob_srvs</name>
35
<version>0.7.8</version>
46
<description>This Package contains Care-O-bot specific service definitions.</description>
@@ -12,10 +14,16 @@
1214
<maintainer email="[email protected]">Florian Weisshardt</maintainer>
1315
<author email="[email protected]">Florian Weisshardt</author>
1416

15-
<buildtool_depend>catkin</buildtool_depend>
17+
<buildtool_depend>ament_cmake</buildtool_depend>
18+
<buildtool_depend>rosidl_default_generators</buildtool_depend>
1619

17-
<build_depend>message_generation</build_depend>
18-
<exec_depend>message_runtime</exec_depend>
19-
<depend>geometry_msgs</depend>
20+
<exec_depend>rosidl_default_runtime</exec_depend>
2021

22+
<test_depend>ament_lint_common</test_depend>
23+
24+
<member_of_group>rosidl_interface_packages</member_of_group>
25+
26+
<export>
27+
<build_type>ament_cmake</build_type>
28+
</export>
2129
</package>

0 commit comments

Comments
 (0)