From 0ae098561c3cb7bb0020211c88d52ad75ec2610c Mon Sep 17 00:00:00 2001 From: Tommy Persson <tommy.persson@liu.se> Date: Tue, 3 May 2016 15:06:32 +0200 Subject: [PATCH] Converting to package file format 2 --- CMakeLists.txt | 2 +- package.xml | 19 +++++++------------ 2 files changed, 8 insertions(+), 13 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 6fada32..d81180a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -107,7 +107,7 @@ catkin_package( ########### ## Specify additional locations of header files -include_directories(include +include_directories( ${catkin_INCLUDE_DIRS} ) diff --git a/package.xml b/package.xml index 1975b8f..9803aa2 100644 --- a/package.xml +++ b/package.xml @@ -1,5 +1,5 @@ <?xml version="1.0"?> -<package> +<package format="2"> <name>lrs_msgs</name> <version>0.0.0</version> <description>The lrs_msgs package</description> @@ -41,18 +41,13 @@ <!-- Use test_depend for packages you need only for testing: --> <!-- <test_depend>gtest</test_depend> --> <buildtool_depend>catkin</buildtool_depend> - <build_depend>lrs_util_gs</build_depend> - <build_depend>geometry_msgs</build_depend> - <build_depend>roscpp</build_depend> - <build_depend>rospy</build_depend> - <build_depend>std_msgs</build_depend> + <depend>lrs_util_gs</depend> + <depend>geometry_msgs</depend> + <depend>roscpp</depend> + <depend>rospy</depend> + <depend>std_msgs</depend> <build_depend>message_generation</build_depend> - <run_depend>geometry_msgs</run_depend> - <run_depend>lrs_util_gs</run_depend> - <run_depend>roscpp</run_depend> - <run_depend>rospy</run_depend> - <run_depend>std_msgs</run_depend> - <run_depend>message_runtime</run_depend> + <exec_depend>message_runtime</exec_depend> <!-- The export tag contains other, unspecified, tags --> -- GitLab