applied some 'catkin lint' cleanups

uchile-robotics · Sep 4, 2017 · 0ee803e · 0ee803e
1 parent 8491ee3
commit 0ee803e
Show file tree

Hide file tree

Showing 5 changed files with 79 additions and 59 deletions.
diff --git a/uchile_msgs/CMakeLists.txt b/uchile_msgs/CMakeLists.txt
@@ -2,10 +2,11 @@ cmake_minimum_required(VERSION 2.8.3)
 project(uchile_msgs)
 
 find_package(catkin REQUIRED COMPONENTS
-  std_msgs
   geometry_msgs
-  sensor_msgs
   message_generation
+  sensor_msgs
+  std_msgs
+  std_srvs
 )
 
 ################################################
@@ -15,50 +16,57 @@ find_package(catkin REQUIRED COMPONENTS
 # Generate messages in the 'msg' folder
 add_message_files(
   FILES
-  baseArmState.msg
-  baseEfectorPosition.msg
-  BlobList.msg
-  CartesianInfo.msg
-  Command.msg
-  CylindricalObject.msg
-  data_follow.msg
-  detections.msg
-  FaceEmotion.msg
-  EmotionDetect.msg
-  FKinfo.msg
-  grip.msg
-  KinectTrackerData.msg
-  LedCommand.msg 
-  LedCommand2.msg 
-  Marker.msg 
-  MarkerArray.msg 
-  Num.msg 
-  ObjectDetection.msg
-  OclusionData.msg
-  PathBlockingDetections.msg
-  PlaneDetection.msg
-  PoseDetections.msg
-  Rect.msg
-  ROIArray.msg
-  SemanticObject.msg
-  ServoCommand.msg 
-  ServoState.msg 
-  SiftDetection.msg
-  SiftDetectionDepth.msg
-  SiftDetectionFloor.msg
-  StateInfo.msg
-  WaveData.msg
+    baseArmState.msg
+    baseEfectorPosition.msg
+    BlobList.msg
+    CartesianInfo.msg
+    Command.msg
+    CylindricalObject.msg
+    data_follow.msg
+    detections.msg
+    EmotionDetect.msg
+    FaceEmotion.msg
+    FKinfo.msg
+    grip.msg
+    KinectTrackerData.msg
+    LedCommand.msg 
+    LedCommand2.msg 
+    Marker.msg 
+    MarkerArray.msg 
+    Num.msg 
+    ObjectDetection.msg
+    OclusionData.msg
+    PathBlockingDetections.msg
+    PlaneDetection.msg
+    PoseDetections.msg
+    Rect.msg
+    ROIArray.msg
+    SemanticObject.msg
+    ServoCommand.msg 
+    ServoState.msg 
+    SiftDetection.msg
+    SiftDetectionDepth.msg
+    SiftDetectionFloor.msg
+    StateInfo.msg
+    WaveData.msg
 )
 
 # Generate added messages and services with any dependencies listed here
 generate_messages(
   DEPENDENCIES
-  std_msgs
-  geometry_msgs
-  sensor_msgs
+    geometry_msgs
+    sensor_msgs
+    std_msgs
 )
 
 ###################################
 ## catkin specific configuration ##
 ###################################
-catkin_package()
+catkin_package(
+  CATKIN_DEPENDS
+    geometry_msgs
+    message_runtime
+    sensor_msgs
+    std_msgs
+    std_srvs
+)
diff --git a/uchile_srvs/CMakeLists.txt b/uchile_srvs/CMakeLists.txt
@@ -2,12 +2,12 @@ cmake_minimum_required(VERSION 2.8.3)
 project(uchile_srvs)
 
 find_package(catkin REQUIRED COMPONENTS
-  uchile_msgs
   geometry_msgs
+  message_generation
   sensor_msgs
   std_msgs
   std_srvs
-  message_generation
+  uchile_msgs
 )
 
 ################################################
@@ -70,14 +70,21 @@ add_service_files(
 ## Generate added messages and services with any dependencies listed here
 generate_messages(
   DEPENDENCIES
-  geometry_msgs
-  sensor_msgs
-  std_msgs
-  uchile_msgs
+    geometry_msgs
+    sensor_msgs
+    std_msgs
+    uchile_msgs
 )
 
 
 ###################################
 ## catkin specific configuration ##
 ###################################
-catkin_package()
+catkin_package(
+  CATKIN_DEPENDS
+    geometry_msgs
+    message_runtime
+    sensor_msgs
+    std_msgs
+    uchile_msgs
+)
diff --git a/uchile_tf/CMakeLists.txt b/uchile_tf/CMakeLists.txt
@@ -5,17 +5,18 @@ project(uchile_tf)
 ## if COMPONENTS list like find_package(catkin REQUIRED COMPONENTS xyz)
 ## is used, also find other catkin packages
 find_package(catkin REQUIRED COMPONENTS
-  uchile_msgs
-  uchile_srvs
   cmake_modules
   dynamic_reconfigure
   geometry_msgs
   kdl_parser
   roscpp
+  sensor_msgs
   std_msgs
   std_srvs
   tf
   tf_conversions
+  uchile_msgs
+  uchile_srvs
 )
 find_package(orocos_kdl REQUIRED)
 find_package(Boost REQUIRED COMPONENTS system thread)
@@ -34,16 +35,18 @@ catkin_package(
     dynamic_robot_state_publisher
   INCLUDE_DIRS include
   CATKIN_DEPENDS
-    uchile_msgs
-    uchile_srvs
     dynamic_reconfigure
     geometry_msgs
+    kdl_parser
     roscpp
+    sensor_msgs
     std_msgs
     std_srvs
     tf
     tf_conversions
-  DEPENDS kdl_parser orocos_kdl
+    uchile_msgs
+    uchile_srvs
+  DEPENDS orocos_kdl
 )
 
 ###########

diff --git a/uchile_util/CMakeLists.txt b/uchile_util/CMakeLists.txt
@@ -2,13 +2,11 @@ cmake_minimum_required(VERSION 2.8.3)
 project(uchile_util)
 
 find_package(catkin REQUIRED COMPONENTS
-  roscpp
-  roslib
-  uchile_msgs
-  uchile_srvs
   rospy
   std_msgs
   std_srvs
+  uchile_msgs
+  uchile_srvs
 )
 
 catkin_python_setup()
@@ -18,16 +16,21 @@ catkin_python_setup()
 ###################################
 catkin_package(
    INCLUDE_DIRS include
-   CATKIN_DEPENDS uchile_msgs uchile_srvs rospy std_msgs std_srvs
+   CATKIN_DEPENDS 
+    rospy
+    std_msgs
+    std_srvs
+    uchile_msgs
+    uchile_srvs
 )
 
 ###########
 ## Build ##
 ###########
 
 include_directories(
-	include
-	${catkin_INCLUDE_DIRS}
+  include
+  ${catkin_INCLUDE_DIRS}
 )
 
 

diff --git a/uchile_util/setup.py b/uchile_util/setup.py
@@ -39,4 +39,3 @@
 )
 
 setup(**setup_args)
-