Skip to content

Commit

Permalink
fix CMakeLists.txt and package.xml for catkin_lint
Browse files Browse the repository at this point in the history
  • Loading branch information
k-okada committed Apr 21, 2019
1 parent 7023642 commit 1557e0a
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 21 deletions.
7 changes: 4 additions & 3 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
cmake_minimum_required(VERSION 2.8.3)
project(opencv_apps)

find_package(catkin REQUIRED COMPONENTS cv_bridge dynamic_reconfigure message_generation image_transport nodelet roscpp sensor_msgs)
find_package(catkin REQUIRED COMPONENTS cv_bridge dynamic_reconfigure message_generation image_transport nodelet roscpp sensor_msgs std_msgs std_srvs)

find_package(OpenCV REQUIRED)
message(STATUS "OpenCV VERSION: ${OpenCV_VERSION}")
Expand Down Expand Up @@ -99,7 +99,7 @@ generate_messages(
std_msgs
)

catkin_package(CATKIN_DEPENDS std_msgs
catkin_package(CATKIN_DEPENDS message_runtime sensor_msgs std_msgs
# DEPENDS OpenCV
INCLUDE_DIRS include
LIBRARIES ${PROJECT_NAME}
Expand Down Expand Up @@ -351,7 +351,8 @@ install(DIRECTORY launch test scripts

## test
if(CATKIN_ENABLE_TESTING)
find_package(catkin REQUIRED COMPONENTS rostest roslaunch)
find_package(rostest REQUIRED)
find_package(roslaunch REQUIRED)
if(roslaunch_VERSION VERSION_LESS "1.11.1")
message(WARNING "roslaunch_add_file check fails with unsupported doc attributes ${roslaunch_VERSION}")
else()
Expand Down
18 changes: 0 additions & 18 deletions cfg/HSIColorFilter.cfg

This file was deleted.

3 changes: 3 additions & 0 deletions package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
<build_depend>message_generation</build_depend>
<build_depend>nodelet</build_depend>
<build_depend>roscpp</build_depend>
<build_depend>sensor_msgs</build_depend>
<build_depend>std_msgs</build_depend>
<build_depend>std_srvs</build_depend>

Expand All @@ -33,9 +34,11 @@
<run_depend>message_runtime</run_depend>
<run_depend>nodelet</run_depend>
<run_depend>roscpp</run_depend>
<run_depend>sensor_msgs</run_depend>
<run_depend>std_msgs</run_depend>
<run_depend>std_srvs</run_depend>

<test_depend>roslaunch</test_depend>
<test_depend>rostest</test_depend>
<test_depend>rosbag</test_depend>
<test_depend>rosservice</test_depend>
Expand Down

0 comments on commit 1557e0a

Please sign in to comment.