fix remaining issues from ipa320#54

floweisshardt · Nov 24, 2015 · ff8e45d · ff8e45d
1 parent 5e0c6fb
commit ff8e45d
Show file tree

Hide file tree

Showing 11 changed files with 46 additions and 75 deletions.
diff --git a/cob_cam3d_throttle/CMakeLists.txt b/cob_cam3d_throttle/CMakeLists.txt
@@ -1,7 +1,7 @@
 cmake_minimum_required(VERSION 2.8.3)
 project(cob_cam3d_throttle)
 
-find_package(catkin REQUIRED COMPONENTS roscpp sensor_msgs pluginlib message_filters nodelet)
+find_package(catkin REQUIRED COMPONENTS message_filters nodelet pluginlib roscpp sensor_msgs)
 
 
 
@@ -11,8 +11,7 @@ find_package(catkin REQUIRED COMPONENTS roscpp sensor_msgs pluginlib message_fil
 ## catkin specific configuration ##
 ###################################
 catkin_package(
-    CATKIN_DEPENDS roscpp sensor_msgs pluginlib message_filters nodelet sensor_msgs
-    INCLUDE_DIRS # TODO include
+    CATKIN_DEPENDS message_filters nodelet pluginlib roscpp sensor_msgs
     LIBRARIES cam3d_throttle
 )
 
@@ -23,7 +22,7 @@ include_directories(${catkin_INCLUDE_DIRS})
 
 add_library(cam3d_throttle src/cam3d_throttle.cpp)
 target_link_libraries(cam3d_throttle ${catkin_LIBRARIES})
-add_dependencies(cam3d_throttle ${catkin_EXPORTED_TARGETS} ${PROJECT_NAME}_generate_messages_cpp)
+add_dependencies(cam3d_throttle ${catkin_EXPORTED_TARGETS})
 
 
 #############

diff --git a/cob_cam3d_throttle/package.xml b/cob_cam3d_throttle/package.xml
@@ -13,18 +13,12 @@
   <author email="[email protected]">Georg Arbeiter</author>
 
   <buildtool_depend>catkin</buildtool_depend>
-
-  <depend>roscpp</depend>
-  <depend>sensor_msgs</depend>
-  <depend>pluginlib</depend>
+
   <depend>message_filters</depend>
   <depend>nodelet</depend>
-
-  <!-- <test_depend>roscpp</test_depend> -->
-  <!-- <test_depend>sensor_msgs</test_depend> -->
-  <!-- <test_depend>pluginlib</test_depend> -->
-  <!-- <test_depend>message_filters</test_depend> -->
-  <!-- <test_depend>nodelet</test_depend> -->
+  <depend>pluginlib</depend>
+  <depend>roscpp</depend>
+  <depend>sensor_msgs</depend>
 
   <export>
     <nodelet plugin="${prefix}/nodelet_plugins.xml"/>

diff --git a/cob_image_flip/CMakeLists.txt b/cob_image_flip/CMakeLists.txt
@@ -1,16 +1,17 @@
 cmake_minimum_required(VERSION 2.8.3)
 project(cob_image_flip)
 
-set(catkin_RUN_PACKAGES # all ROS packages from package.xml (libopencv-dev is system dependency --> sudo apt-get install)
-	roscpp
-	sensor_msgs
+# all ROS packages from package.xml (libopencv-dev is system dependency --> sudo apt-get install)
+set(catkin_RUN_PACKAGES 
+	cv_bridge
 	geometry_msgs
-	tf
 	image_transport
-	cv_bridge
 	nodelet
 	pcl_ros
 	pcl_conversions
+	roscpp
+	sensor_msgs
+	tf
 )
 
 set(catkin_BUILD_PACKAGES 

diff --git a/cob_image_flip/package.xml b/cob_image_flip/package.xml
@@ -15,20 +15,19 @@
   <url>http://wiki.ros.org/cob_image_flip</url>
 
   <buildtool_depend>catkin</buildtool_depend>
-
+
+  <depend>boost</depend>
+  <depend>cmake_modules</depend>  
+  <depend>cv_bridge</depend>
+  <depend>geometry_msgs</depend>
+  <depend>image_transport</depend>
   <depend>libopencv-dev</depend>
+  <depend>nodelet</depend>
+  <depend>pcl_conversions</depend>
   <depend>pcl_ros</depend>
-  <depend>cmake_modules</depend>
   <depend>roscpp</depend>
   <depend>sensor_msgs</depend>
-  <depend>geometry_msgs</depend>
   <depend>tf</depend>
-  <depend>image_transport</depend>
-  <depend>cv_bridge</depend>
-  <depend>nodelet</depend>
-  <depend>pcl_conversions</depend>
-
-  <depend>boost</depend>
 
   <export>
     <nodelet plugin="${prefix}/nodelet_plugins.xml" />

diff --git a/cob_object_detection_msgs/package.xml b/cob_object_detection_msgs/package.xml
@@ -15,15 +15,14 @@
   <url>http://wiki.ros.org/cob_object_detection_msgs</url>
 
   <buildtool_depend>catkin</buildtool_depend>
+
+  <build_depend>message_generation</build_depend>
+  <exec_depend>message_runtime</exec_depend>
 
   <depend>actionlib_msgs</depend>
   <depend>geometry_msgs</depend>
-  <depend>message_generation</depend>
   <depend>sensor_msgs</depend>
   <depend>std_msgs</depend>
   <depend>std_srvs</depend>
-
-  <exec_depend>message_runtime</exec_depend>
-
+
 </package>
-
diff --git a/cob_object_detection_visualizer/CMakeLists.txt b/cob_object_detection_visualizer/CMakeLists.txt
@@ -6,9 +6,10 @@ if(NOT CMAKE_BUILD_TYPE)
     set(CMAKE_BUILD_TYPE Release) # RelWithDebInfo)
 endif(NOT CMAKE_BUILD_TYPE)
 
-set(catkin_RUN_PACKAGES # all ROS packages from package.xml (libopencv-dev is system dependency --> sudo apt-get install)
-  roscpp
+# all ROS packages from package.xml (libopencv-dev is system dependency --> sudo apt-get install)
+set(catkin_RUN_PACKAGES 
   cob_object_detection_msgs
+  roscpp
   visualization_msgs
 )
 

diff --git a/cob_object_detection_visualizer/package.xml b/cob_object_detection_visualizer/package.xml
@@ -8,33 +8,13 @@
   <license>LGPL</license>
   <author email="[email protected]">Richard Bormann</author> -->
 
-
-  <!-- The *_depend tags are used to specify dependencies -->
-  <!-- Dependencies can be catkin packages or system dependencies -->
-  <!-- Examples: -->
-  <!-- Use build_depend for packages you need at compile time: -->
-  <!--   <build_depend>message_generation</build_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 test_depend for packages you need only for testing: -->
-  <!--   <test_depend>gtest</test_depend> -->
-
   <buildtool_depend>catkin</buildtool_depend>
-  
+
   <depend>cmake_modules</depend>
+  <depend>cob_object_detection_msgs</depend>  
   <depend>roscpp</depend>
-  <depend>cob_object_detection_msgs</depend>
   <depend>visualization_msgs</depend>
 
-
-  <!-- The export tag contains other, unspecified, tags -->
   <export>
-    <!-- You can specify that this package is a metapackage here: -->
-    <!-- <metapackage/> -->
-
-    <!-- Other tools can request additional information be placed here -->
-
   </export>
 </package>
diff --git a/cob_perception_common/package.xml b/cob_perception_common/package.xml
@@ -16,17 +16,16 @@
   <url>http://wiki.ros.org/cob_perception_common</url>
 
   <buildtool_depend>catkin</buildtool_depend>
-
+
+  <exec_depend>cob_cam3d_throttle</exec_depend>    
   <exec_depend>cob_image_flip</exec_depend>
-  <exec_depend>cob_cam3d_throttle</exec_depend>
   <exec_depend>cob_object_detection_msgs</exec_depend>
+  <exec_depend>cob_object_detection_visualizer</exec_depend>
   <exec_depend>cob_perception_msgs</exec_depend>
   <exec_depend>cob_vision_utils</exec_depend>
-  <exec_depend>cob_object_detection_visualizer</exec_depend>
 
   <export>
     <metapackage/>
   </export>
 
-
 </package>
diff --git a/cob_perception_msgs/CMakeLists.txt b/cob_perception_msgs/CMakeLists.txt
@@ -5,8 +5,8 @@ project(cob_perception_msgs)
 ## if COMPONENTS list like find_package(catkin REQUIRED COMPONENTS xyz)
 ## is used, also find other catkin packages
 find_package(catkin REQUIRED COMPONENTS
-  message_generation
   geometry_msgs
+  message_generation
   sensor_msgs
   std_msgs
 )
@@ -55,9 +55,9 @@ generate_messages(
 ## DEPENDS: system dependencies of this project that dependent projects also need
 catkin_package(
   CATKIN_DEPENDS
+    geometry_msgs
     message_runtime
     sensor_msgs
-    geometry_msgs
     std_msgs
 )
 

diff --git a/cob_perception_msgs/package.xml b/cob_perception_msgs/package.xml
@@ -2,26 +2,26 @@
 <package format="2">
   <name>cob_perception_msgs</name>
   <version>0.6.6</version>
-  
+
   <description>
      This package contains common message type definitions for perception tasks.
   </description>
-  
+
   <license>LGPL</license>
-  
+
   <maintainer email="[email protected]">Richard Bormann</maintainer>
   <author>Richard Bormann</author>
-  
+
   <url>http://wiki.ros.org/cob_perception_msgs</url>
 
   <buildtool_depend>catkin</buildtool_depend>
-
-  <depend>message_generation</depend>
+
+  <build_depend>message_generation</build_depend>
+  <exec_depend>message_runtime</exec_depend>
+
   <depend>sensor_msgs</depend>
   <depend>geometry_msgs</depend>
   <depend>std_msgs</depend>
-
-  <exec_depend>message_runtime</exec_depend>
 
 </package>
 
diff --git a/cob_vision_utils/package.xml b/cob_vision_utils/package.xml
@@ -9,21 +9,20 @@
 
   <license>LGPL</license>
 
-  <maintainer email="jsf@ipa.fhg.de">Jan Fischer</maintainer>
+  <maintainer email="rmb@ipa.fhg.de">Richard Bormann</maintainer>
   <author>Jan Fischer</author>
 
   <url>http://wiki.ros.org/cob_vision_utils</url>
 
   <buildtool_depend>catkin</buildtool_depend>
 
+  <depend>cmake_modules</depend>
   <depend>libopencv-dev</depend>
   <depend>roscpp</depend>
-  <depend>visualization_msgs</depend>
-  <depend>cmake_modules</depend>
   <depend>tinyxml</depend>
+  <depend>visualization_msgs</depend>
 
   <export>
-        <!--cpp cflags="-I${prefix}/common/include -I${prefix}/ros/include" lflags="-Wl,-rpath,${prefix}/common/lib -L${prefix}/common/lib -lcob_vision_utils"/-->
   </export>
 
 </package>