catkin lint fixes

Author: reinzor

image_recognition_jetson/CMakeLists.txt

@@ -16,7 +16,9 @@ find_package(catkin REQUIRED COMPONENTS
   sensor_msgs
 )
 
-catkin_package()
+catkin_package(
+  CATKIN_DEPENDS cv_bridge image_recognition_msgs image_recognition_util image_transport roscpp sensor_msgs
+)
 
 include_directories(${catkin_INCLUDE_DIRS})
 
@@ -39,3 +41,16 @@ add_dependencies(detect_net ${catkin_EXPORTED_TARGETS})
 
 add_executable(detect_net_ros src/detect_net_ros.cpp)
 target_link_libraries(detect_net_ros detect_net)
+
+install(TARGETS
+  detect_net_ros
+  detect_net
+  ARCHIVE DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}
+  LIBRARY DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}
+  RUNTIME DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION}
+)
+
+install(PROGRAMS
+  scripts/install_jetson_inference.bash
+  DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION}
+)

image_recognition_msgs/CMakeLists.txt

@@ -32,5 +32,5 @@ generate_messages(
 )
 
 catkin_package(
-  CATKIN_DEPENDS message_generation sensor_msgs
+  CATKIN_DEPENDS message_runtime sensor_msgs
 )

image_recognition_openface/CMakeLists.txt

@@ -1,12 +1,7 @@
 cmake_minimum_required(VERSION 2.8.3)
 project(image_recognition_openface)
 
-find_package(catkin REQUIRED COMPONENTS
-  cv_bridge
-  image_recognition_msgs
-  image_recognition_util
-  rospy
-)
+find_package(catkin REQUIRED COMPONENTS)
 
 catkin_python_setup()
 
@@ -15,5 +10,6 @@ catkin_package()
 install(PROGRAMS
   scripts/face_recognition_node
   scripts/get_face_recognition
+  scripts/train_from_images
   DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION}
 )

image_recognition_openpose/CMakeLists.txt

@@ -12,7 +12,9 @@ find_package(catkin REQUIRED COMPONENTS
   diagnostic_updater
 )
 
-catkin_package()
+catkin_package(
+  CATKIN_DEPENDS roscpp cv_bridge sensor_msgs image_recognition_msgs diagnostic_updater
+)
 
 set(OPENPOSE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/openpose)
 IF(EXISTS ${OPENPOSE_DIR})
@@ -36,7 +38,7 @@ IF(EXISTS ${OPENPOSE_DIR})
 
   add_library(openpose_wrapper src/openpose_wrapper.cpp)
 
-  target_link_libraries(openpose_wrapper 
+  target_link_libraries(openpose_wrapper
     ${CAFFE_LINK_LIBRARY}
     ${OPENPOSE_LINK_LIBRARY}
     ${catkin_LIBRARIES}
@@ -60,3 +62,11 @@ add_executable(${PROJECT_NAME}_node src/openpose_ros_node.cpp)
 
 # Specify libraries to link a library or executable target against
 target_link_libraries(${PROJECT_NAME}_node openpose_wrapper)
+
+install(TARGETS
+  ${PROJECT_NAME}_node
+  openpose_wrapper
+  ARCHIVE DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}
+  LIBRARY DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}
+  RUNTIME DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION}
+)

image_recognition_openpose/package.xml

@@ -15,4 +15,5 @@
   <depend>image_recognition_msgs</depend>
   <depend>libopencv-dev</depend>
   <depend>roscpp</depend>
+  <depend>sensor_msgs</depend>
 </package>

image_recognition_rqt/CMakeLists.txt

@@ -4,14 +4,7 @@ project(image_recognition_rqt)
 ## Find catkin macros and libraries
 ## if COMPONENTS list like find_package(catkin REQUIRED COMPONENTS xyz)
 ## is used, also find other catkin packages
-find_package(catkin REQUIRED COMPONENTS
-  rospy
-  rqt_gui
-  rqt_gui_py
-  image_recognition_msgs
-  image_recognition_util
-  sensor_msgs
-)
+find_package(catkin REQUIRED)
 
 catkin_python_setup()
 
@@ -23,6 +16,7 @@ install(FILES plugin.xml
 
 install(PROGRAMS
   scripts/annotation_gui
+  scripts/folder_image_publisher
   scripts/manual_gui
   scripts/test_gui
   DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION}

image_recognition_tensorflow/CMakeLists.txt

@@ -1,18 +1,16 @@
 cmake_minimum_required(VERSION 2.8.3)
 project(image_recognition_tensorflow)
 
-find_package(catkin REQUIRED COMPONENTS
-  rospy
-  image_recognition_msgs
-  image_recognition_util
-)
+find_package(catkin REQUIRED)
 
 catkin_python_setup()
 
 catkin_package()
 
 install(PROGRAMS
-  scripts/retrain
+  scripts/evaluate_classifier
+  scripts/get_object_recognition
   scripts/object_recognition_node
+  scripts/retrain
   DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION}
 )

image_recognition_tensorflow_rqt/CMakeLists.txt

@@ -1,14 +1,7 @@
 cmake_minimum_required(VERSION 2.8.3)
 project(image_recognition_tensorflow_rqt)
 
-## Find catkin macros and libraries
-## if COMPONENTS list like find_package(catkin REQUIRED COMPONENTS xyz)
-## is used, also find other catkin packages
-find_package(catkin REQUIRED COMPONENTS
-  rqt_gui
-  rqt_gui_py
-  image_recognition_tensorflow
-)
+find_package(catkin REQUIRED)
 
 catkin_python_setup()
 

image_recognition_util/CMakeLists.txt

@@ -11,3 +11,9 @@ if (CATKIN_ENABLE_TESTING)
     find_package(rostest REQUIRED)
     add_rostest(test/test_all.test)
 endif()
+
+install(PROGRAMS
+  scripts/publish_image_with_recognitions_overlay
+
+  DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION}
+)