latest pushes
This commit is contained in:
@@ -17,18 +17,14 @@ else()
|
||||
endif()
|
||||
|
||||
|
||||
if($ENV{ROS_VERSION} EQUAL 1)
|
||||
add_service_files(
|
||||
DIRECTORY srv
|
||||
FILES
|
||||
ClipFootstep.srv
|
||||
PlanFootsteps.srv
|
||||
PlanFootstepsBetweenFeet.srv
|
||||
StepTargetService.srv
|
||||
)
|
||||
else()
|
||||
ament_package()
|
||||
endif()
|
||||
add_service_files(
|
||||
DIRECTORY srv
|
||||
FILES
|
||||
ClipFootstep.srv
|
||||
PlanFootsteps.srv
|
||||
PlanFootstepsBetweenFeet.srv
|
||||
StepTargetService.srv
|
||||
)
|
||||
|
||||
|
||||
add_message_files(
|
||||
@@ -49,5 +45,11 @@ add_action_files(
|
||||
#And now generate the messages
|
||||
generate_messages(DEPENDENCIES ${MESSAGE_DEPENDENCIES})
|
||||
|
||||
# Generate catkin/pkg-config import information
|
||||
catkin_package(CATKIN_DEPENDS message_runtime ${MESSAGE_DEPENDENCIES})
|
||||
|
||||
if($ENV{ROS_VERSION} EQUAL 1)
|
||||
catkin_package(
|
||||
CATKIN_DEPENDS
|
||||
message_runtime
|
||||
${MESSAGE_DEPENDENCIES}
|
||||
)
|
||||
endif()
|
||||
|
@@ -1,42 +1,37 @@
|
||||
<?xml version="1.0"?>
|
||||
<package format="3">
|
||||
<name>humanoid_nav_msgs</name>
|
||||
<version>0.3.0</version>
|
||||
<version>0.3.2</version>
|
||||
<description>
|
||||
Messages and services for humanoid robot navigation
|
||||
</description>
|
||||
<author>Armin Hornung</author>
|
||||
<maintainer email="ronaldsonbellande@gmail.com">Ronaldson Bellande</maintainer>
|
||||
<license>Apache 2.0</license>
|
||||
|
||||
|
||||
<buildtool_depend condition="$ROS_VERSION == 1">catkin</buildtool_depend>
|
||||
|
||||
<build_depend condition="$ROS_VERSION == 1">message_generation</build_depend>
|
||||
<build_depend condition="$ROS_VERSION == 1">std_msgs</build_depend>
|
||||
<build_depend condition="$ROS_VERSION == 1">geometry_msgs</build_depend>
|
||||
<build_depend condition="$ROS_VERSION == 1">actionlib_msgs</build_depend>
|
||||
|
||||
<run_depend condition="$ROS_VERSION == 1">message_runtime</run_depend>
|
||||
<run_depend condition="$ROS_VERSION == 1">std_msgs</run_depend>
|
||||
<run_depend condition="$ROS_VERSION == 1">geometry_msgs</run_depend>
|
||||
<run_depend condition="$ROS_VERSION == 1">actionlib_msgs</run_depend>
|
||||
|
||||
|
||||
<buildtool_depend condition="$ROS_VERSION == 2">ament_cmake</buildtool_depend>
|
||||
|
||||
<build_depend condition="$ROS_VERSION == 2">message_generation</build_depend>
|
||||
<build_depend condition="$ROS_VERSION == 2">std_msgs</build_depend>
|
||||
<build_depend condition="$ROS_VERSION == 2">geometry_msgs</build_depend>
|
||||
<build_depend condition="$ROS_VERSION == 2">actionlib_msgs</build_depend>
|
||||
|
||||
<condition if="$ROS_VERSION == 1">
|
||||
<build_depend>message_generation</build_depend>
|
||||
<build_depend>std_msgs</build_depend>
|
||||
<build_depend>geometry_msgs</build_depend>
|
||||
<build_depend>actionlib_msgs</build_depend>
|
||||
|
||||
<run_depend>message_runtime</run_depend>
|
||||
<run_depend>std_msgs</run_depend>
|
||||
<run_depend>geometry_msgs</run_depend>
|
||||
<run_depend>actionlib_msgs</run_depend>
|
||||
</condition>
|
||||
|
||||
|
||||
<condition if="$ROS_VERSION == 2">
|
||||
<build_depend>message_generation</build_depend>
|
||||
<build_depend>std_msgs</build_depend>
|
||||
<build_depend>geometry_msgs</build_depend>
|
||||
<build_depend>actionlib_msgs</build_depend>
|
||||
|
||||
<run_depend>message_runtime</run_depend>
|
||||
<run_depend>std_msgs</run_depend>
|
||||
<run_depend>geometry_msgs</run_depend>
|
||||
<run_depend>actionlib_msgs</run_depend>
|
||||
</condition>
|
||||
|
||||
<run_depend condition="$ROS_VERSION == 2">message_runtime</run_depend>
|
||||
<run_depend condition="$ROS_VERSION == 2">std_msgs</run_depend>
|
||||
<run_depend condition="$ROS_VERSION == 2">geometry_msgs</run_depend>
|
||||
<run_depend condition="$ROS_VERSION == 2">actionlib_msgs</run_depend>
|
||||
|
||||
</package>
|
||||
|
Reference in New Issue
Block a user