From 58573f2fd38fec85a198f11ac86fea6aab212a35 Mon Sep 17 00:00:00 2001 From: Aaron Blasdel Date: Thu, 20 Sep 2012 23:55:49 +0000 Subject: [PATCH] updated catkin to latest version: added package.xml and updated CMakeLists.txt --- core/mk/manifest.xml | 2 ++ core/mk/package.xml | 15 +++++++++++++++ core/rosbuild/package.xml | 18 ++++++++++++++++++ core/roslang/CMakeLists.txt | 2 +- core/roslang/package.xml | 19 +++++++++++++++++++ core/roslib/package.xml | 25 +++++++++++++++++++++++++ tools/rosbash/package.xml | 24 ++++++++++++++++++++++++ tools/rosboost_cfg/CMakeLists.txt | 2 +- tools/rosboost_cfg/package.xml | 16 ++++++++++++++++ tools/rosclean/CMakeLists.txt | 2 +- tools/rosclean/package.xml | 16 ++++++++++++++++ 11 files changed, 138 insertions(+), 3 deletions(-) create mode 100644 core/mk/package.xml create mode 100644 core/rosbuild/package.xml create mode 100644 core/roslang/package.xml create mode 100644 core/roslib/package.xml create mode 100644 tools/rosbash/package.xml create mode 100644 tools/rosboost_cfg/package.xml create mode 100644 tools/rosclean/package.xml diff --git a/core/mk/manifest.xml b/core/mk/manifest.xml index 076ed4e0..ed284762 100644 --- a/core/mk/manifest.xml +++ b/core/mk/manifest.xml @@ -3,4 +3,6 @@ Morgan Quigley, Brian Gerkey BSD + + diff --git a/core/mk/package.xml b/core/mk/package.xml new file mode 100644 index 00000000..27e17dac --- /dev/null +++ b/core/mk/package.xml @@ -0,0 +1,15 @@ + + mk + 1.9.9 + +A collection of .mk include files for building ROS architectural elements. Most package authors should use cmake .mk, which calls CMake for the build of the package. The other files in this package are intended for use in exotic situations that mostly arise when importing 3rdparty code. + + Dirk Thomas + BSD + + http://www.ros.org/wiki/ROS + Morgan Quigley + Brian Gerkey + + catkin + diff --git a/core/rosbuild/package.xml b/core/rosbuild/package.xml new file mode 100644 index 00000000..981439bf --- /dev/null +++ b/core/rosbuild/package.xml @@ -0,0 +1,18 @@ + + rosbuild + 1.9.9 + + + rosbuild contains scripts for managing the CMake-based build system for ROS. + + + Dirk Thomas + BSD + + http://ros.org/wiki/rosbuild + Brian Gerkey + Troy Straszheim + Morgan Quigley + + catkin + diff --git a/core/roslang/CMakeLists.txt b/core/roslang/CMakeLists.txt index a47aaef8..2b638e5f 100644 --- a/core/roslang/CMakeLists.txt +++ b/core/roslang/CMakeLists.txt @@ -1,7 +1,7 @@ cmake_minimum_required(VERSION 2.8) project(roslang) find_package(catkin REQUIRED) -catkin_project(${PROJECT_NAME}) +catkin_package_export() install(FILES cmake/roslang.cmake DESTINATION ${CATKIN_PROJECT_SHARE_DESTINATION}/cmake) diff --git a/core/roslang/package.xml b/core/roslang/package.xml new file mode 100644 index 00000000..0b880537 --- /dev/null +++ b/core/roslang/package.xml @@ -0,0 +1,19 @@ + + roslang + 1.9.9 + + + roslang is a common package that all + ROS client + libraries depend on. This is mainly used to find client + libraries (via 'rospack depends-on1 roslang'). + + + Dirk Thomas + BSD + + http://ros.org/wiki/roslang + Brian Gerkey + + catkin + diff --git a/core/roslib/package.xml b/core/roslib/package.xml new file mode 100644 index 00000000..a5648b81 --- /dev/null +++ b/core/roslib/package.xml @@ -0,0 +1,25 @@ + + roslib + 1.9.9 + + + Base dependencies and support libraries for ROS. roslib contains many of the common data structures and tools that are shared across ROS client library implementations. + + + Dirk Thomas + BSD + + http://ros.org/wiki/roslib + Ken Conley + Morgan Quigley + Josh Faust + + catkin + boost + python + + + + + + diff --git a/tools/rosbash/package.xml b/tools/rosbash/package.xml new file mode 100644 index 00000000..2be5cc01 --- /dev/null +++ b/tools/rosbash/package.xml @@ -0,0 +1,24 @@ + + rosbash + 1.9.9 + + + Assorted shell commands for using ros with bash. + + + Dirk Thomas + BSD + + http://www.ros.org/wiki/rosbash + Jeremy Leibs + Thibault Kruse + + catkin + + + + + + + + diff --git a/tools/rosboost_cfg/CMakeLists.txt b/tools/rosboost_cfg/CMakeLists.txt index 0fac4d10..d0258b36 100644 --- a/tools/rosboost_cfg/CMakeLists.txt +++ b/tools/rosboost_cfg/CMakeLists.txt @@ -1,4 +1,4 @@ cmake_minimum_required(VERSION 2.8) project(rosboost_cfg) find_package(catkin REQUIRED) -catkin_project(${PROJECT_NAME}) +catkin_package_export() diff --git a/tools/rosboost_cfg/package.xml b/tools/rosboost_cfg/package.xml new file mode 100644 index 00000000..2e1e9984 --- /dev/null +++ b/tools/rosboost_cfg/package.xml @@ -0,0 +1,16 @@ + + rosboost_cfg + 1.9.9 + + + Contains scripts used by the rosboost-cfg tool for determining cflags/lflags/etc. of boost on your system + + + Dirk Thomas + BSD + + http://ros.org/wiki/rosboost_cfg + Josh Faust + + catkin + diff --git a/tools/rosclean/CMakeLists.txt b/tools/rosclean/CMakeLists.txt index 2dd549d5..caa56beb 100644 --- a/tools/rosclean/CMakeLists.txt +++ b/tools/rosclean/CMakeLists.txt @@ -1,6 +1,6 @@ cmake_minimum_required(VERSION 2.8) project(rosclean) find_package(catkin REQUIRED) -catkin_project(${PROJECT_NAME}) +catkin_package_export() catkin_add_nosetests(test) diff --git a/tools/rosclean/package.xml b/tools/rosclean/package.xml new file mode 100644 index 00000000..6fc5b3e3 --- /dev/null +++ b/tools/rosclean/package.xml @@ -0,0 +1,16 @@ + + ros + 1.9.9 + + + rosclean: cleanup filesystem resources (e.g. log files). + + + Dirk Thomas + BSD + + http://ros.org/wiki/rosclean + Ken Conley + + catkin +