## your messages/services/actions (e.g. std_msgs, actionlib_msgs, ...).
## * In the file package.xml:
## * add a build_depend tag for "message_generation"
-## * add a build_depend and a run_depend tag for each package in MSG_DEP_SET
+## * add a build_depend and a exec_depend tag for each package in MSG_DEP_SET
## * If MSG_DEP_SET isn't empty the following dependency has been pulled in
## but can be declared for certainty nonetheless:
-## * add a run_depend tag for "message_runtime"
+## * add a exec_depend tag for "message_runtime"
## * In this file (CMakeLists.txt):
## * add "message_generation" and every package in MSG_DEP_SET to
## find_package(catkin REQUIRED COMPONENTS ...)
## To declare and build dynamic reconfigure parameters within this
## package, follow these steps:
## * In the file package.xml:
-## * add a build_depend and a run_depend tag for "dynamic_reconfigure"
+## * add a build_depend and a exec_depend tag for "dynamic_reconfigure"
## * In this file (CMakeLists.txt):
## * add "dynamic_reconfigure" to
## find_package(catkin REQUIRED COMPONENTS ...)
###################################
## The catkin_package macro generates cmake config files for your package
## Declare things to be passed to dependent projects
-## INCLUDE_DIRS: uncomment this if you package contains header files
+## INCLUDE_DIRS: uncomment this if your package contains header files
## LIBRARIES: libraries you create in this project that dependent projects also need
## CATKIN_DEPENDS: catkin_packages dependent projects also need
## DEPENDS: system dependencies of this project that dependent projects also need
<?xml version="1.0"?>
-<package>
+<package format="2">
<name>q2d_bringup</name>
- <version>0.0.0</version>
+ <version>2.0.0</version>
<description>The q2d_bringup package</description>
<!-- One maintainer tag required, multiple allowed, one person per tag -->
<!-- <maintainer email="jane.doe@example.com">Jane Doe</maintainer> -->
<maintainer email="fetter@ece.ufrgs.br">Walter Fetter Lages</maintainer>
-
<!-- One license tag required, multiple allowed, one license per tag -->
<!-- Commonly used license strings: -->
<!-- BSD, MIT, Boost Software License, GPLv2, GPLv3, LGPLv2.1, LGPLv3 -->
<author email="fetter@ece.ufrgs.br">Walter Fetter Lages</author>
- <!-- The *_depend tags are used to specify dependencies -->
+ <!-- The *depend tags are used to specify dependencies -->
<!-- Dependencies can be catkin packages or system dependencies -->
<!-- Examples: -->
+ <!-- Use depend as a shortcut for packages that are both build and exec dependencies -->
+ <!-- <depend>roscpp</depend> -->
+ <!-- Note that this is equivalent to the following: -->
+ <!-- <build_depend>roscpp</build_depend> -->
+ <!-- <exec_depend>roscpp</exec_depend> -->
<!-- Use build_depend for packages you need at compile time: -->
<!-- <build_depend>message_generation</build_depend> -->
+ <!-- Use build_export_depend for packages you need in order to build against this package: -->
+ <!-- <build_export_depend>message_generation</build_export_depend> -->
<!-- Use buildtool_depend for build tool packages: -->
<!-- <buildtool_depend>catkin</buildtool_depend> -->
- <!-- Use run_depend for packages you need at runtime: -->
- <!-- <run_depend>message_runtime</run_depend> -->
+ <!-- Use exec_depend for packages you need at runtime: -->
+ <!-- <exec_depend>message_runtime</exec_depend> -->
<!-- Use test_depend for packages you need only for testing: -->
<!-- <test_depend>gtest</test_depend> -->
+ <!-- Use doc_depend for packages you need only for building documentation: -->
+ <!-- <doc_depend>doxygen</doc_depend> -->
<buildtool_depend>catkin</buildtool_depend>
<build_depend>effort_controllers</build_depend>
<build_depend>joint_state_controller</build_depend>
- <run_depend>effort_controllers</run_depend>
- <run_depend>joint_state_controller</run_depend>
+ <build_export_depend>effort_controllers</build_export_depend>
+ <build_export_depend>joint_state_controller</build_export_depend>
+ <exec_depend>effort_controllers</exec_depend>
+ <exec_depend>joint_state_controller</exec_depend>
<!-- The export tag contains other, unspecified, tags -->
## your messages/services/actions (e.g. std_msgs, actionlib_msgs, ...).
## * In the file package.xml:
## * add a build_depend tag for "message_generation"
-## * add a build_depend and a run_depend tag for each package in MSG_DEP_SET
+## * add a build_depend and a exec_depend tag for each package in MSG_DEP_SET
## * If MSG_DEP_SET isn't empty the following dependency has been pulled in
## but can be declared for certainty nonetheless:
-## * add a run_depend tag for "message_runtime"
+## * add a exec_depend tag for "message_runtime"
## * In this file (CMakeLists.txt):
## * add "message_generation" and every package in MSG_DEP_SET to
## find_package(catkin REQUIRED COMPONENTS ...)
## To declare and build dynamic reconfigure parameters within this
## package, follow these steps:
## * In the file package.xml:
-## * add a build_depend and a run_depend tag for "dynamic_reconfigure"
+## * add a build_depend and a exec_depend tag for "dynamic_reconfigure"
## * In this file (CMakeLists.txt):
## * add "dynamic_reconfigure" to
## find_package(catkin REQUIRED COMPONENTS ...)
###################################
## The catkin_package macro generates cmake config files for your package
## Declare things to be passed to dependent projects
-## INCLUDE_DIRS: uncomment this if you package contains header files
+## INCLUDE_DIRS: uncomment this if your package contains header files
## LIBRARIES: libraries you create in this project that dependent projects also need
## CATKIN_DEPENDS: catkin_packages dependent projects also need
## DEPENDS: system dependencies of this project that dependent projects also need
<?xml version="1.0"?>
-<package>
+<package format="2">
<name>q2d_description</name>
- <version>0.0.0</version>
+ <version>2.0.0</version>
<description>The q2d_description package</description>
<!-- One maintainer tag required, multiple allowed, one person per tag -->
<author email="fetter@ece.ufrgs.br">Walter Fetter Lages</author>
- <!-- The *_depend tags are used to specify dependencies -->
+ <!-- The *depend tags are used to specify dependencies -->
<!-- Dependencies can be catkin packages or system dependencies -->
<!-- Examples: -->
+ <!-- Use depend as a shortcut for packages that are both build and exec dependencies -->
+ <!-- <depend>roscpp</depend> -->
+ <!-- Note that this is equivalent to the following: -->
+ <!-- <build_depend>roscpp</build_depend> -->
+ <!-- <exec_depend>roscpp</exec_depend> -->
<!-- Use build_depend for packages you need at compile time: -->
<!-- <build_depend>message_generation</build_depend> -->
+ <!-- Use build_export_depend for packages you need in order to build against this package: -->
+ <!-- <build_export_depend>message_generation</build_export_depend> -->
<!-- Use buildtool_depend for build tool packages: -->
<!-- <buildtool_depend>catkin</buildtool_depend> -->
- <!-- Use run_depend for packages you need at runtime: -->
- <!-- <run_depend>message_runtime</run_depend> -->
+ <!-- Use exec_depend for packages you need at runtime: -->
+ <!-- <exec_depend>message_runtime</exec_depend> -->
<!-- Use test_depend for packages you need only for testing: -->
<!-- <test_depend>gtest</test_depend> -->
+ <!-- Use doc_depend for packages you need only for building documentation: -->
+ <!-- <doc_depend>doxygen</doc_depend> -->
<buildtool_depend>catkin</buildtool_depend>
<transmission name="shoulder_active_transmission">\r
<type>transmission_interface/SimpleTransmission</type>\r
<joint name="shoulder_active_joint">\r
- <hardwareInterface>EffortJointInterface</hardwareInterface>\r
+ <hardwareInterface>hardware_interface/EffortJointInterface</hardwareInterface>\r
</joint>\r
<actuator name="shoulder_motor">\r
<mechanicalReduction>1</mechanicalReduction>\r
<transmission name="elbow_active_transmission">\r
<type>transmission_interface/SimpleTransmission</type>\r
<joint name="elbow_active_joint">\r
- <hardwareInterface>EffortJointInterface</hardwareInterface>\r
+ <hardwareInterface>hardware_interface/EffortJointInterface</hardwareInterface>\r
</joint>\r
<actuator name="elbow_motor">\r
<mechanicalReduction>1</mechanicalReduction>\r
project(q2d_teleop)
## Compile as C++11, supported in ROS Kinetic and newer
-# add_compile_options(-std=c++11)
+add_compile_options(-std=c++11)
## Find catkin macros and libraries
## if COMPONENTS list like find_package(catkin REQUIRED COMPONENTS xyz)
## is used, also find other catkin packages
find_package(catkin REQUIRED COMPONENTS
cmake_modules
+ geometry_msgs
kdl_parser
roscpp
sensor_msgs
- geometry_msgs
std_msgs
urdf
)
## System dependencies are found with CMake's conventions
# find_package(Boost REQUIRED COMPONENTS system)
-find_package(Eigen REQUIRED)
+find_package(Eigen3 REQUIRED)
find_package(orocos_kdl REQUIRED)
## your messages/services/actions (e.g. std_msgs, actionlib_msgs, ...).
## * In the file package.xml:
## * add a build_depend tag for "message_generation"
-## * add a build_depend and a run_depend tag for each package in MSG_DEP_SET
+## * add a build_depend and a exec_depend tag for each package in MSG_DEP_SET
## * If MSG_DEP_SET isn't empty the following dependency has been pulled in
## but can be declared for certainty nonetheless:
-## * add a run_depend tag for "message_runtime"
+## * add a exec_depend tag for "message_runtime"
## * In this file (CMakeLists.txt):
## * add "message_generation" and every package in MSG_DEP_SET to
## find_package(catkin REQUIRED COMPONENTS ...)
## Generate added messages and services with any dependencies listed here
# generate_messages(
# DEPENDENCIES
-# sensor_msgs geometry_msgs # std_msgs
+# geometry_msgs# sensor_msgs# std_msgs
# )
################################################
## To declare and build dynamic reconfigure parameters within this
## package, follow these steps:
## * In the file package.xml:
-## * add a build_depend and a run_depend tag for "dynamic_reconfigure"
+## * add a build_depend and a exec_depend tag for "dynamic_reconfigure"
## * In this file (CMakeLists.txt):
## * add "dynamic_reconfigure" to
## find_package(catkin REQUIRED COMPONENTS ...)
###################################
## The catkin_package macro generates cmake config files for your package
## Declare things to be passed to dependent projects
-## INCLUDE_DIRS: uncomment this if you package contains header files
+## INCLUDE_DIRS: uncomment this if your package contains header files
## LIBRARIES: libraries you create in this project that dependent projects also need
## CATKIN_DEPENDS: catkin_packages dependent projects also need
## DEPENDS: system dependencies of this project that dependent projects also need
catkin_package(
# INCLUDE_DIRS include
# LIBRARIES q2d_teleop
-# CATKIN_DEPENDS cmake_modules kdl_parser roscpp sensor_msgs goemetry_msgs std_msgs urdf
-# DEPENDS Eigen
+# CATKIN_DEPENDS cmake_modules geometry_msgs kdl_parser orocos_kdl roscpp sensor_msgs std_msgs urdf
+# DEPENDS system_lib
)
###########
# include
${catkin_INCLUDE_DIRS}
# TODO: Check names of system library include directories (Eigen)
- ${Eigen_INCLUDE_DIRS}
+ ${EIGEN3_INCLUDE_DIRS}
${orocos_kdl_INCLUDE_DIRS}
)
## Specify libraries to link a library or executable target against
target_link_libraries(q2d_teleop_tablet
${catkin_LIBRARIES}
- ${Eigen_LIBRARIES}
+# ${Eigen3_LIBRARIES}
${orocos_kdl_LIBRARIES}
)
target_link_libraries(q2d_teleop_rviz
${catkin_LIBRARIES}
- ${Eigen_LIBRARIES}
+# ${Eigen3_LIBRARIES}
${orocos_kdl_LIBRARIES}
)
<?xml version="1.0"?>
-<package>
+<package format="2">
<name>q2d_teleop</name>
- <version>0.0.0</version>
+ <version>2.0.0</version>
<description>The q2d_teleop package</description>
<!-- One maintainer tag required, multiple allowed, one person per tag -->
<!-- <maintainer email="jane.doe@example.com">Jane Doe</maintainer> -->
<maintainer email="fetter@ece.ufrgs.br">Walter Fetter Lages</maintainer>
-
<!-- One license tag required, multiple allowed, one license per tag -->
<!-- Commonly used license strings: -->
<!-- BSD, MIT, Boost Software License, GPLv2, GPLv3, LGPLv2.1, LGPLv3 -->
<author email="fetter@ece.ufrgs.br">Walter Fetter Lages</author>
- <!-- The *_depend tags are used to specify dependencies -->
+ <!-- The *depend tags are used to specify dependencies -->
<!-- Dependencies can be catkin packages or system dependencies -->
<!-- Examples: -->
+ <!-- Use depend as a shortcut for packages that are both build and exec dependencies -->
+ <!-- <depend>roscpp</depend> -->
+ <!-- Note that this is equivalent to the following: -->
+ <!-- <build_depend>roscpp</build_depend> -->
+ <!-- <exec_depend>roscpp</exec_depend> -->
<!-- Use build_depend for packages you need at compile time: -->
<!-- <build_depend>message_generation</build_depend> -->
+ <!-- Use build_export_depend for packages you need in order to build against this package: -->
+ <!-- <build_export_depend>message_generation</build_export_depend> -->
<!-- Use buildtool_depend for build tool packages: -->
<!-- <buildtool_depend>catkin</buildtool_depend> -->
- <!-- Use run_depend for packages you need at runtime: -->
- <!-- <run_depend>message_runtime</run_depend> -->
+ <!-- Use exec_depend for packages you need at runtime: -->
+ <!-- <exec_depend>message_runtime</exec_depend> -->
<!-- Use test_depend for packages you need only for testing: -->
<!-- <test_depend>gtest</test_depend> -->
+ <!-- Use doc_depend for packages you need only for building documentation: -->
+ <!-- <doc_depend>doxygen</doc_depend> -->
<buildtool_depend>catkin</buildtool_depend>
<build_depend>Eigen</build_depend>
<build_depend>cmake_modules</build_depend>
+ <build_depend>geometry_msgs</build_depend>
<build_depend>kdl_parser</build_depend>
<build_depend>orocos_kdl</build_depend>
<build_depend>roscpp</build_depend>
<build_depend>sensor_msgs</build_depend>
- <build_depend>geometry_msgs</build_depend>
<build_depend>std_msgs</build_depend>
<build_depend>urdf</build_depend>
- <run_depend>Eigen</run_depend>
- <run_depend>cmake_modules</run_depend>
- <run_depend>kdl_parser</run_depend>
- <run_depend>orocos_kdl</run_depend>
- <run_depend>roscpp</run_depend>
- <run_depend>sensor_msgs</run_depend>
- <run_depend>geometry_msgs</run_depend>
- <run_depend>std_msgs</run_depend>
- <run_depend>urdf</run_depend>
+ <build_export_depend>Eigen</build_export_depend>
+ <build_export_depend>cmake_modules</build_export_depend>
+ <build_export_depend>geometry_msgs</build_export_depend>
+ <build_export_depend>kdl_parser</build_export_depend>
+ <build_export_depend>orocos_kdl</build_export_depend>
+ <build_export_depend>roscpp</build_export_depend>
+ <build_export_depend>sensor_msgs</build_export_depend>
+ <build_export_depend>std_msgs</build_export_depend>
+ <build_export_depend>urdf</build_export_depend>
+ <exec_depend>Eigen</exec_depend>
+ <exec_depend>cmake_modules</exec_depend>
+ <exec_depend>geometry_msgs</exec_depend>
+ <exec_depend>kdl_parser</exec_depend>
+ <exec_depend>orocos_kdl</exec_depend>
+ <exec_depend>roscpp</exec_depend>
+ <exec_depend>sensor_msgs</exec_depend>
+ <exec_depend>std_msgs</exec_depend>
+ <exec_depend>urdf</exec_depend>
<!-- The export tag contains other, unspecified, tags -->
projects / q2d.git / commitdiff