fix package.xml/CMakeLists.txt to supress catkin_lint errors

jsk-ros-pkg · Jun 23, 2023 · 1e60647 · 1e60647
1 parent 32aa299
commit 1e60647
Show file tree

Hide file tree

Showing 27 changed files with 55 additions and 56 deletions.
diff --git a/3rdparty/aques_talk/package.xml b/3rdparty/aques_talk/package.xml
@@ -14,6 +14,8 @@
   <run_depend>nkf</run_depend>
   <run_depend>sound_play</run_depend>
 
+  <test_depend>rostest</test_depend>
+
 </package>
 
 
diff --git a/3rdparty/assimp_devel/CMakeLists.txt b/3rdparty/assimp_devel/CMakeLists.txt
@@ -23,7 +23,6 @@ else()
     INCLUDE_DIRS ${CATKIN_DEVEL_PREFIX}/include/assimp_devel
     LIBRARIES    assimp_devel
     EXPORTED_TARGETS libassimp_devel
-    SKIP_CMAKE_CONFIG_GENERATION
     )
 endif()
 execute_process(COMMAND sed -i s@${${PROJECT_NAME}_VERSION}@3.0.1@ ${CATKIN_DEVEL_PREFIX}/lib/pkgconfig/assimp_devel.pc)

diff --git a/3rdparty/libsiftfast/CMakeLists.txt b/3rdparty/libsiftfast/CMakeLists.txt
@@ -23,7 +23,6 @@ else()
     INCLUDE_DIRS ${CATKIN_DEVEL_PREFIX}/include
     LIBRARIES    siftfast
     EXPORTED_TARGETS libsiftfast
-    SKIP_CMAKE_CONFIG_GENERATION
     )
 endif()
 

diff --git a/bayesian_belief_networks/CMakeLists.txt b/bayesian_belief_networks/CMakeLists.txt
@@ -7,6 +7,7 @@ set(CATKIN_VERSION ${catkin_VERSION}) #this is used in setup.py
 # Use configure_file because when installing package, this CATKIN_VERSION
 # environmental variable is not available
 configure_file(${PROJECT_SOURCE_DIR}/setup.py.in ${PROJECT_SOURCE_DIR}/setup.py)
+#catkin_lint: ignore missing_file
 catkin_python_setup()
 
 add_message_files(DIRECTORY msg FILES Result.msg Observation.msg)

diff --git a/dialogflow_task_executive/CMakeLists.txt b/dialogflow_task_executive/CMakeLists.txt
@@ -14,8 +14,6 @@ endif()
 
 find_package(catkin REQUIRED COMPONENTS
     message_generation
-    std_msgs
-    actionlib_msgs
     catkin_virtualenv
 )
 
@@ -29,11 +27,7 @@ add_action_files(
   DialogText.action
 )
 
-generate_messages(
-  DEPENDENCIES
-  std_msgs
-  actionlib_msgs
-)
+generate_messages()
 
 catkin_package(
   CATKIN_DEPENDS message_runtime
@@ -81,7 +75,7 @@ install(DIRECTORY launch
 )
 
 if(CATKIN_ENABLE_TESTING)
-  find_package(catkin REQUIRED COMPONENTS roslaunch rostest)
+  find_package(roslaunch rostest REQUIRED)
   roslaunch_add_file_check(launch)
   if(NOT (gcc_dump_machine MATCHES "x86_64-.*" OR gcc_dump_machine MATCHES "aarch64-.*"))
     message(WARNING "pip -i requirements.txt work only with i686, so skipping test for ${gcc_dump_machine}")

diff --git a/dialogflow_task_executive/package.xml b/dialogflow_task_executive/package.xml
@@ -18,11 +18,10 @@
   <buildtool_depend>catkin</buildtool_depend>
   <build_depend>catkin_virtualenv</build_depend>
   <build_depend>message_generation</build_depend>
-  <build_depend>actionlib_msgs</build_depend>
-  <build_depend>std_msgs</build_depend>
   <build_depend>roslaunch</build_depend>
   <run_depend>app_manager</run_depend>
   <run_depend>message_runtime</run_depend>
+  <run_depend>std_msgs</run_depend>
   <run_depend>speech_recognition_msgs</run_depend>
   <run_depend>topic_tools</run_depend>
   <!-- <run_depend>python-dialogflow-pip</run_depend> install via catkin_virtualenv -->

diff --git a/gdrive_ros/CMakeLists.txt b/gdrive_ros/CMakeLists.txt
@@ -4,7 +4,6 @@ project(gdrive_ros)
 find_package(catkin REQUIRED COMPONENTS
   catkin_virtualenv REQUIRED
   rospy
-  std_msgs
   message_generation
 )
 
@@ -17,8 +16,6 @@ add_service_files(
 )
 
 generate_messages(
-  DEPENDENCIES
-  std_msgs
 )
 
 catkin_package(
@@ -55,6 +52,6 @@ install(FILES requirements.txt
 )
 
 if(CATKIN_ENABLE_TESTING)
-  find_package(catkin REQUIRED COMPONENTS rostest roslaunch)
+  find_package(rostest roslaunch REQUIRED)
   roslaunch_add_file_check(launch/gdrive_server.launch)
 endif()
diff --git a/gdrive_ros/package.xml b/gdrive_ros/package.xml
@@ -15,7 +15,6 @@
   <buildtool_depend>catkin</buildtool_depend>
   <build_depend>rospy</build_depend>
   <build_depend>message_generation</build_depend>
-  <build_depend>std_msgs</build_depend>
   <build_depend>catkin_virtualenv</build_depend>
 
   <run_depend>rospy</run_depend>

diff --git a/google_chat_ros/CMakeLists.txt b/google_chat_ros/CMakeLists.txt
@@ -5,8 +5,6 @@ find_package(
   catkin REQUIRED COMPONENTS
   catkin_virtualenv REQUIRED
   rospy
-  actionlib_msgs
-  std_msgs
   message_generation
   )
 
@@ -21,11 +19,7 @@ add_action_files(
   SendMessage.action
   )
 
-generate_messages(
-  DEPENDENCIES
-  std_msgs
-  actionlib_msgs
-  )
+generate_messages()
 
 catkin_package()
 
@@ -49,11 +43,6 @@ catkin_install_python(
   PROGRAMS ${PYTHON_SCRIPT_FILES}
   DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION})
 
-# python requirements
-install(FILES requirements.txt
-  DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}
-  )
-
 # launch
 install(DIRECTORY launch
   DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}

diff --git a/google_chat_ros/package.xml b/google_chat_ros/package.xml
@@ -10,14 +10,14 @@
   <license>BSD</license>
 
   <buildtool_depend>catkin</buildtool_depend>
-  <buildtool_depend>python3-setuptools</buildtool_depend>
+  <buildtool_depend condition="$ROS_PYTHON_VERSION == 2">python-setuptools</buildtool_depend>
+  <buildtool_depend condition="$ROS_PYTHON_VERSION == 3">python3-setuptools</buildtool_depend>
 
   <build_depend>message_generation</build_depend>
   <build_depend>catkin_virtualenv</build_depend>
 
   <exec_depend>message_runtime</exec_depend>
   <exec_depend>rospy</exec_depend>
-  <exec_depend>std_msgs</exec_depend>
   <exec_depend>gdrive_ros</exec_depend>
   <exec_depend>dialogflow_task_executive</exec_depend>
 

diff --git a/google_chat_ros/test/test_import.py b/google_chat_ros/test/test_import.py
@@ -1,3 +1,4 @@
+#!/usr/bin/env python
 import unittest
 import sys
 

diff --git a/jsk_ros_patch/collada_urdf_jsk_patch/CMakeLists.txt b/jsk_ros_patch/collada_urdf_jsk_patch/CMakeLists.txt
@@ -25,6 +25,7 @@ find_package(catkin REQUIRED)
 catkin_package(CATKIN_DEPENDS collada_urdf)
 
 
+#catkin_lint: ignore immutable_var
 set(ENV{PKG_CONFIG_PATH} ${CATKIN_DEVEL_PREFIX}/lib/pkgconfig:$ENV{PKG_CONFIG_PATH})
 add_custom_target(urdf_to_collada ALL DEPENDS ${CATKIN_DEVEL_PREFIX}/${CATKIN_PACKAGE_BIN_DESTINATION}/urdf_to_collada)
 add_custom_command(OUTPUT ${CATKIN_DEVEL_PREFIX}/${CATKIN_PACKAGE_BIN_DESTINATION}/urdf_to_collada

diff --git a/jsk_ros_patch/collada_urdf_jsk_patch/package.xml b/jsk_ros_patch/collada_urdf_jsk_patch/package.xml
@@ -40,7 +40,9 @@
   <build_depend>git</build_depend>
   <build_depend condition="$ROS_PYTHON_VERSION == 2">python-catkin-tools</build_depend>
   <build_depend condition="$ROS_PYTHON_VERSION == 3">python3-catkin-tools</build_depend>
-
+
+  <build_export_depend>collada_urdf</build_export_depend>
+
   <exec_depend>collada_parser</exec_depend>
   <exec_depend>collada_urdf</exec_depend>
   <exec_depend>urdf</exec_depend>

diff --git a/nfc_ros/package.xml b/nfc_ros/package.xml
@@ -17,6 +17,8 @@
   <build_export_depend>message_generation</build_export_depend>
   <exec_depend>message_runtime</exec_depend>
 
+  <test_depend>rostest</test_depend>
+
   <export>
       <pip_requirements>requirements.txt</pip_requirements>
   </export>

diff --git a/pgm_learner/CMakeLists.txt b/pgm_learner/CMakeLists.txt
@@ -3,7 +3,6 @@ project(pgm_learner)
 
 find_package(catkin REQUIRED COMPONENTS
   message_generation
-  std_msgs
   rospy
 )
 
@@ -33,7 +32,6 @@ add_service_files(
 
 generate_messages(
   DEPENDENCIES
-  std_msgs
 )
 
 catkin_package()
@@ -47,7 +45,7 @@ install(
 if(CATKIN_ENABLE_TESTING)
   # python-libpgm-pip did not work with python3
   if ("$ENV{ROS_PYTHON_VERSION}" STREQUAL "2")
-    find_package(catkin REQUIRED COMPONENTS rostest)
+    find_package(rostest REQUIRED)
     add_rostest(test/test_discrete_bn.test)
     add_rostest(test/test_lg_bn.test)
   endif()

diff --git a/respeaker_ros/package.xml b/respeaker_ros/package.xml
@@ -24,6 +24,7 @@
   <exec_depend condition="$ROS_PYTHON_VERSION == 2">python-pyaudio</exec_depend>
   <exec_depend condition="$ROS_PYTHON_VERSION == 3">python3-pyaudio</exec_depend>
 
+  <test_depend>rostest</test_depend>
   <test_depend>jsk_tools</test_depend>
 
   <export>

diff --git a/ros_google_cloud_language/CMakeLists.txt b/ros_google_cloud_language/CMakeLists.txt
@@ -36,7 +36,6 @@ generate_messages(
   DEPENDENCIES
   actionlib_msgs
   diagnostic_msgs
-  std_msgs
 )
 
 catkin_package(

diff --git a/ros_google_cloud_language/package.xml b/ros_google_cloud_language/package.xml
@@ -16,8 +16,11 @@
   <exec_depend>message_runtime</exec_depend>
   <exec_depend>rospy</exec_depend>
 
+  <depend>actionlib_msgs</depend>
   <depend>diagnostic_msgs</depend>
 
+  <test_depend>rostest</test_depend>
+
   <export>
     <pip_requirements>requirements.txt</pip_requirements>
   </export>

diff --git a/ros_speech_recognition/CMakeLists.txt b/ros_speech_recognition/CMakeLists.txt
@@ -49,7 +49,7 @@ install(FILES requirements.txt
 )
 
 if(CATKIN_ENABLE_TESTING)
-  find_package(catkin REQUIRED COMPONENTS rostest roslaunch)
+  find_package(rostest roslaunch REQUIRED)
   add_rostest(test/sample_ros_speech_recognition.test
     DEPENDENCIES ${PROJECT_NAME}_generate_virtualenv
   )

diff --git a/rosping/CMakeLists.txt b/rosping/CMakeLists.txt
@@ -44,6 +44,6 @@ install(DIRECTORY test
   DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}
   USE_SOURCE_PERMISSIONS
   )
-if (NOT $ENV{ROS_DISTRO} STREQUAL "indigo")
+if (CATKIN_ENABLE_TESTING AND (NOT $ENV{ROS_DISTRO} STREQUAL "indigo"))
   add_rostest(test/test-rosping.test)
-endif(NOT $ENV{ROS_DISTRO} STREQUAL "indigo")
+endif(CATKIN_ENABLE_TESTING AND (NOT $ENV{ROS_DISTRO} STREQUAL "indigo"))
diff --git a/rostwitter/CMakeLists.txt b/rostwitter/CMakeLists.txt
@@ -7,7 +7,6 @@ find_package(catkin REQUIRED COMPONENTS
   dynamic_reconfigure
   message_generation
   rospy
-  std_msgs
   mk
 )
 
@@ -20,7 +19,7 @@ add_action_files(
 
 
 generate_messages(
-  DEPENDENCIES actionlib_msgs std_msgs)
+  DEPENDENCIES actionlib_msgs)
 
 generate_dynamic_reconfigure_options(
   cfg/TweetImageServer.cfg

diff --git a/rostwitter/package.xml b/rostwitter/package.xml
@@ -14,7 +14,6 @@
   <build_depend>actionlib_msgs</build_depend>
   <build_depend>dynamic_reconfigure</build_depend>
   <build_depend>rospy</build_depend>
-  <build_depend>std_msgs</build_depend>
   <build_depend>message_generation</build_depend>
   <build_depend>mk</build_depend>
   <build_depend>git</build_depend>
@@ -31,6 +30,8 @@
   <exec_depend condition="$ROS_PYTHON_VERSION == 2">python-simplejson</exec_depend>
   <exec_depend condition="$ROS_PYTHON_VERSION == 3">python3-simplejson</exec_depend>
 
+  <build_export_depend>actionlib_msgs</build_export_depend>
+
   <test_depend>rostest</test_depend>
 
   <export>

diff --git a/sesame_ros/package.xml b/sesame_ros/package.xml
@@ -21,6 +21,8 @@
 
   <exec_depend>message_runtime</exec_depend>
 
+  <test_depend>rostest</test_depend>
+
   <export>
     <pip_requirements>requirements.txt</pip_requirements>
   </export>

diff --git a/switchbot_ros/CMakeLists.txt b/switchbot_ros/CMakeLists.txt
@@ -5,7 +5,6 @@ find_package(
   catkin REQUIRED COMPONENTS
   message_generation
   actionlib_msgs
-  std_msgs
 )
 
 catkin_python_setup()
@@ -24,7 +23,6 @@ add_action_files(
 generate_messages(
   DEPENDENCIES
   actionlib_msgs
-  std_msgs
 )
 
 catkin_package()

diff --git a/switchbot_ros/package.xml b/switchbot_ros/package.xml
@@ -17,15 +17,15 @@
   <build_depend>actionlib</build_depend>
   <build_depend>actionlib_msgs</build_depend>
   <build_depend>message_generation</build_depend>
-  <build_depend>std_msgs</build_depend>
 
   <exec_depend condition="$ROS_PYTHON_VERSION == 2">python-requests</exec_depend>
   <exec_depend condition="$ROS_PYTHON_VERSION == 3">python3-requests</exec_depend>
   <exec_depend>actionlib</exec_depend>
   <exec_depend>actionlib_msgs</exec_depend>
   <exec_depend>message_runtime</exec_depend>
   <exec_depend>rospy</exec_depend>
-  <exec_depend>std_msgs</exec_depend>
+
+  <build_export_depend>actionlib_msgs</build_export_depend>
 
   <export>
   </export>

diff --git a/zdepth_image_transport/CMakeLists.txt b/zdepth_image_transport/CMakeLists.txt
@@ -12,12 +12,12 @@ find_package(catkin REQUIRED
 )
 
 if("$ENV{ROS_DISTRO}" STRGREATER "kinetic")
-  find_library(zdepth_LIB zdepth PATH_SUFFIXES zdepth)
-  find_library(zstd_LIB zstd PATH_SUFFIXES zdepth)
-  set(zdepth_LIBRARIES ${zdepth_LIB} ${zstd_LIB})
-  find_file(zdepth_INCLUDE zdepth.hpp PATH_SUFFIXES zdepth)
-  get_filename_component(zdepth_PATH ${zdepth_INCLUDE} DIRECTORY)
-  get_filename_component(zdepth_INCLUDE_DIRS ${zdepth_PATH} DIRECTORY)
+  find_library(${PROJECT_NAME}_zdepth_LIB zdepth PATH_SUFFIXES zdepth)
+  find_library(${PROJECT_NAME}_zstd_LIB zstd PATH_SUFFIXES zdepth)
+  set(${PROJECT_NAME}_zdepth_LIBRARIES ${${PROJECT_NAME}_zdepth_LIB} ${${PROJECT_NAME}_zstd_LIB})
+  find_file(${PROJECT_NAME}_zdepth_INCLUDE zdepth.hpp PATH_SUFFIXES zdepth)
+  get_filename_component(${PROJECT_NAME}_zdepth_PATH ${${PROJECT_NAME}_zdepth_INCLUDE} DIRECTORY)
+  get_filename_component(${PROJECT_NAME}_zdepth_INCLUDE_DIRS ${${PROJECT_NAME}_zdepth_PATH} DIRECTORY)
 endif()
 
 add_message_files(
@@ -40,17 +40,17 @@ catkin_package(
   sensor_msgs
   std_msgs
   DEPENDS
-  zdepth
+  ${PROJECT_NAME}_zdepth
 )
 
 if("$ENV{ROS_DISTRO}" STRGREATER "kinetic")
-  include_directories(include ${catkin_INCLUDE_DIRS} ${zdepth_INCLUDE_DIRS})
+  include_directories(include ${catkin_INCLUDE_DIRS} ${${PROJECT_NAME}_zdepth_INCLUDE_DIRS})
 
   add_executable(zdepth_test src/test/zdepth_test.cpp)
-  target_link_libraries(zdepth_test ${catkin_LIBRARIES} ${zdepth_LIBRARIES})
+  target_link_libraries(zdepth_test ${catkin_LIBRARIES} ${${PROJECT_NAME}_zdepth_LIBRARIES})
 
   add_library(${PROJECT_NAME} src/manifest.cpp src/zdepth_publisher.cpp src/zdepth_subscriber.cpp)
-  target_link_libraries(${PROJECT_NAME} ${catkin_LIBRARIES} ${zdepth_LIBRARIES})
+  target_link_libraries(${PROJECT_NAME} ${catkin_LIBRARIES} ${${PROJECT_NAME}_zdepth_LIBRARIES})
   add_dependencies(${PROJECT_NAME} ${PROJECT_NAME}_generate_messages_cpp)
 
   install(TARGETS zdepth_test