wet repo

matlabbe · Apr 30, 2013 · e21a25c · e21a25c
1 parent c272c67
commit e21a25c
Show file tree

Hide file tree

Showing 21 changed files with 175 additions and 226 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
diff --git a/Makefile b/Makefile
diff --git a/bag_tools/CMakeLists.txt b/bag_tools/CMakeLists.txt
@@ -1,38 +1,22 @@
-cmake_minimum_required(VERSION 2.4.6)
-include($ENV{ROS_ROOT}/core/rosbuild/rosbuild.cmake)
+cmake_minimum_required(VERSION 2.8.3)
+project(bag_tools)
 
-# Set the build type.  Options are:
-#  Coverage       : w/ debug symbols, w/o optimization, w/ code-coverage
-#  Debug          : w/ debug symbols, w/o optimization
-#  Release        : w/o debug symbols, w/ optimization
-#  RelWithDebInfo : w/ debug symbols, w/ optimization
-#  MinSizeRel     : w/o debug symbols, w/ optimization, stripped binaries
-#set(ROS_BUILD_TYPE RelWithDebInfo)
+find_package(catkin REQUIRED COMPONENTS rospy rosbag sensor_msgs cv_bridge message_filters image_proc stereo_image_proc image_geometry camera_calibration_parsers)
+find_package(Boost REQUIRED COMPONENTS signals thread)
+find_package(OpenCV REQUIRED)
 
-rosbuild_init()
+catkin_package(
+  INCLUDE_DIRS include
+  CATKIN_DEPENDS rosbag
+)
 
-#set the default path for built executables to the "bin" directory
-set(EXECUTABLE_OUTPUT_PATH ${PROJECT_SOURCE_DIR}/bin)
-#set the default path for built libraries to the "lib" directory
-set(LIBRARY_OUTPUT_PATH ${PROJECT_SOURCE_DIR}/lib)
+include_directories(include ${Boost_INCLUDE_DIRS} ${catkin_INCLUDE_DIRS})
 
-#uncomment if you have defined messages
-#rosbuild_genmsg()
-#uncomment if you have defined services
-#rosbuild_gensrv()
+add_executable(extract_images src/extract_images.cpp)
+add_executable(extract_stereo_images src/extract_stereo_images.cpp)
+add_executable(process_stereo src/process_stereo.cpp)
 
-rosbuild_add_boost_directories()
-rosbuild_add_executable(extract_images src/extract_images.cpp)
-rosbuild_add_executable(extract_stereo_images src/extract_stereo_images.cpp)
-rosbuild_add_executable(process_stereo src/process_stereo.cpp)
+target_link_libraries(extract_images ${Boost_LIBRARIES} ${OpenCV_LIBRARIES} ${catkin_LIBRARIES})
+target_link_libraries(extract_stereo_images ${Boost_LIBRARIES} ${OpenCV_LIBRARIES} ${catkin_LIBRARIES})
+target_link_libraries(process_stereo ${Boost_LIBRARIES} ${OpenCV_LIBRARIES} ${catkin_LIBRARIES})
 
-rosbuild_link_boost(extract_images signals)
-rosbuild_link_boost(extract_stereo_images signals)
-rosbuild_link_boost(process_stereo signals)
-#common commands for building c++ executables and libraries
-#rosbuild_add_library(${PROJECT_NAME} src/example.cpp)
-#target_link_libraries(${PROJECT_NAME} another_library)
-#rosbuild_add_boost_directories()
-#rosbuild_link_boost(${PROJECT_NAME} thread)
-#rosbuild_add_executable(example examples/example.cpp)
-#target_link_libraries(example ${PROJECT_NAME})
diff --git a/bag_tools/Makefile b/bag_tools/Makefile
diff --git a/bag_tools/manifest.xml b/bag_tools/manifest.xml
diff --git a/bag_tools/package.xml b/bag_tools/package.xml
@@ -0,0 +1,37 @@
+<package>
+  <name>bag_tools</name>
+  <version>0.0.1</version>
+  <description>ROS tools and scripts related to bagfiles</description>
+  <maintainer email="[email protected]">Miquel Massot</maintainer>
+
+  <license>BSD</license>
+
+  <url type="website">http://ros.org/wiki/bag_tools</url>
+  <!-- <url type="bugtracker"></url> -->
+
+  <author email="[email protected]">Stephan Wirth</author>
+  <author email="[email protected]">Miquel Massot</author>
+
+  <buildtool_depend>catkin</buildtool_depend>
+  <build_depend>rospy</build_depend>
+  <build_depend>rosbag</build_depend>
+  <build_depend>sensor_msgs</build_depend>
+  <build_depend>cv_bridge</build_depend>
+  <build_depend>message_filters</build_depend>
+  <build_depend>image_proc</build_depend>
+  <build_depend>stereo_image_proc</build_depend>
+  <build_depend>image_geometry</build_depend>
+  <build_depend>camera_calibration_parsers</build_depend>
+  <run_depend>rospy</run_depend>
+  <run_depend>rosbag</run_depend>
+  <run_depend>sensor_msgs</run_depend>
+  <run_depend>cv_bridge</run_depend>
+  <run_depend>message_filters</run_depend>
+  <run_depend>image_proc</run_depend>
+  <run_depend>stereo_image_proc</run_depend>
+  <run_depend>image_geometry</run_depend>
+  <run_depend>camera_calibration_parsers</run_depend>
+
+  <export>
+  </export>
+</package>
diff --git a/launch_tools/CMakeLists.txt b/launch_tools/CMakeLists.txt
@@ -1,30 +1,6 @@
-cmake_minimum_required(VERSION 2.4.6)
-include($ENV{ROS_ROOT}/core/rosbuild/rosbuild.cmake)
+cmake_minimum_required(VERSION 2.8.3)
+project(launch_tools)
 
-# Set the build type.  Options are:
-#  Coverage       : w/ debug symbols, w/o optimization, w/ code-coverage
-#  Debug          : w/ debug symbols, w/o optimization
-#  Release        : w/o debug symbols, w/ optimization
-#  RelWithDebInfo : w/ debug symbols, w/ optimization
-#  MinSizeRel     : w/o debug symbols, w/ optimization, stripped binaries
-#set(ROS_BUILD_TYPE RelWithDebInfo)
+find_package(catkin REQUIRED COMPONENTS rospy roslib)
 
-rosbuild_init()
-
-#set the default path for built executables to the "bin" directory
-set(EXECUTABLE_OUTPUT_PATH ${PROJECT_SOURCE_DIR}/bin)
-#set the default path for built libraries to the "lib" directory
-set(LIBRARY_OUTPUT_PATH ${PROJECT_SOURCE_DIR}/lib)
-
-#uncomment if you have defined messages
-#rosbuild_genmsg()
-#uncomment if you have defined services
-#rosbuild_gensrv()
-
-#common commands for building c++ executables and libraries
-#rosbuild_add_library(${PROJECT_NAME} src/example.cpp)
-#target_link_libraries(${PROJECT_NAME} another_library)
-#rosbuild_add_boost_directories()
-#rosbuild_link_boost(${PROJECT_NAME} thread)
-#rosbuild_add_executable(example examples/example.cpp)
-#target_link_libraries(example ${PROJECT_NAME})
+catkin_package()
diff --git a/launch_tools/Makefile b/launch_tools/Makefile
diff --git a/launch_tools/manifest.xml b/launch_tools/manifest.xml
diff --git a/launch_tools/package.xml b/launch_tools/package.xml
@@ -0,0 +1,20 @@
+<package>
+  <name>launch_tools</name>
+  <version>0.0.1</version>
+  <description>ROS tools and scripts related to launchfiles</description>
+  <maintainer email="[email protected]">Miquel Massot</maintainer>
+
+  <license>BSD</license>
+
+  <url type="website">http://ros.org/wiki/launch_tools</url>
+
+  <author email="[email protected]">Stephan Wirth</author>
+  <author email="[email protected]">Miquel Massot</author>
+
+  <buildtool_depend>catkin</buildtool_depend>
+  <build_depend>rospy</build_depend>
+  <build_depend>roslib</build_depend>
+  <run_depend>rospy</run_depend>
+  <run_depend>roslib</run_depend>
+
+</package>
diff --git a/pointcloud_tools/CMakeLists.txt b/pointcloud_tools/CMakeLists.txt
@@ -1,40 +1,20 @@
-cmake_minimum_required(VERSION 2.4.6)
-include($ENV{ROS_ROOT}/core/rosbuild/rosbuild.cmake)
+cmake_minimum_required(VERSION 2.8.3)
+project(pointcloud_tools)
 
-# Set the build type.  Options are:
-#  Coverage       : w/ debug symbols, w/o optimization, w/ code-coverage
-#  Debug          : w/ debug symbols, w/o optimization
-#  Release        : w/o debug symbols, w/ optimization
-#  RelWithDebInfo : w/ debug symbols, w/ optimization
-#  MinSizeRel     : w/o debug symbols, w/ optimization, stripped binaries
-#set(ROS_BUILD_TYPE RelWithDebInfo)
+find_package(catkin REQUIRED COMPONENTS roscpp pcl_ros std_msgs sensor_msgs )
+find_package(pcl REQUIRED )
 
-rosbuild_init()
+catkin_package()
 
-#set the default path for built executables to the "bin" directory
-set(EXECUTABLE_OUTPUT_PATH ${PROJECT_SOURCE_DIR}/bin)
-#set the default path for built libraries to the "lib" directory
-set(LIBRARY_OUTPUT_PATH ${PROJECT_SOURCE_DIR}/lib)
+include_directories(/usr/include/vtk-5.8 ${catkin_INCLUDE_DIRS} ${pcl_INCLUDE_DIRS})
 
-#uncomment if you have defined messages
-#rosbuild_genmsg()
-#uncomment if you have defined services
-#rosbuild_gensrv()
+add_executable(pointcloud_mapper src/pointcloud_mapper.cpp)
+add_executable(pointcloud_filtering src/pointcloud_filtering.cpp)
+add_executable(pcd_publisher src/pcd_publisher.cpp)
+add_executable(pointcloud_viewer src/pointcloud_viewer.cpp)
 
-#common commands for building c++ executables and libraries
-#rosbuild_add_library(${PROJECT_NAME} src/example.cpp)
-#target_link_libraries(${PROJECT_NAME} another_library)
-#rosbuild_add_boost_directories()
-#rosbuild_link_boost(${PROJECT_NAME} thread)
-#rosbuild_add_executable(example examples/example.cpp)
-#target_link_libraries(example ${PROJECT_NAME})
-
-include_directories(/usr/include/vtk-5.8)
-
-rosbuild_add_executable(pointcloud_mapper src/pointcloud_mapper.cpp)
-rosbuild_add_executable(pointcloud_filtering src/pointcloud_filtering.cpp)
-rosbuild_add_executable(pcd_publisher src/pcd_publisher.cpp)
-rosbuild_add_executable(pointcloud_viewer src/pointcloud_viewer.cpp)
-
-target_link_libraries(pointcloud_viewer ${PCL_LIBRARIES} libvtkCommon.so libvtkFiltering.so libvtkRendering.so)
+target_link_libraries(pointcloud_viewer ${PCL_LIBRARIES} ${catkin_LIBRARIES} libvtkCommon.so libvtkFiltering.so libvtkRendering.so)
+target_link_libraries(pcd_publisher ${PCL_LIBRARIES} ${catkin_LIBRARIES})
+target_link_libraries(pointcloud_mapper ${PCL_LIBRARIES} ${catkin_LIBRARIES})
+target_link_libraries(pointcloud_filtering ${PCL_LIBRARIES} ${catkin_LIBRARIES})
 
diff --git a/pointcloud_tools/Makefile b/pointcloud_tools/Makefile
diff --git a/pointcloud_tools/manifest.xml b/pointcloud_tools/manifest.xml
diff --git a/pointcloud_tools/package.xml b/pointcloud_tools/package.xml
@@ -0,0 +1,27 @@
+<package>
+  <name>pointcloud_tools</name>
+  <version>0.0.1</version>
+  <description>pointcloud_tools</description>
+  <maintainer email="[email protected]">Pep Lluis Negre</maintainer>
+
+  <license>BSD</license>
+
+  <url type="website">http://ros.org/wiki/pointcloud_tools</url>
+  <!-- <url type="bugtracker"></url> -->
+
+  <author email="[email protected]">Pep Lluis Negre</author>
+
+  <buildtool_depend>catkin</buildtool_depend>
+  <build_depend>roscpp</build_depend>
+  <build_depend>pcl_ros</build_depend>
+  <build_depend>std_msgs</build_depend>
+  <build_depend>sensor_msgs</build_depend>
+  <run_depend>roscpp</run_depend>
+  <run_depend>pcl_ros</run_depend>
+  <run_depend>std_msgs</run_depend>
+  <run_depend>sensor_msgs</run_depend>
+
+  <export>
+
+  </export>
+</package>
diff --git a/srv_tools/CMakeLists.txt b/srv_tools/CMakeLists.txt
@@ -0,0 +1,4 @@
+cmake_minimum_required(VERSION 2.8.3)
+project(srv_tools)
+find_package(catkin REQUIRED)
+catkin_metapackage()
diff --git a/srv_tools/package.xml b/srv_tools/package.xml
@@ -0,0 +1,24 @@
+<package>
+  <name>srv_tools</name>
+  <version>0.0.1</version>
+  <description>Stack with interesting ROS tools</description>
+   <maintainer email="[email protected]">Miquel Massot</maintainer>
+
+  <license>BSD</license>
+
+  <url type="website">http://ros.org/wiki/srv_tools</url>
+  <!-- <url type="bugtracker"></url> -->
+
+  <author email="[email protected]">Stephan Wirth</author>
+  <author email="[email protected]">Miquel Massot</author>
+
+  <buildtool_depend>catkin</buildtool_depend>
+  <run_depend>launch_tools</run_depend>
+  <run_depend>tf_tools</run_depend>
+  <run_depend>pointcloud_tools</run_depend>
+  <run_depend>bag_tools</run_depend>
+
+  <export>
+    <metapackage/>
+  </export>
+</package>
diff --git a/stack.xml b/stack.xml