Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Lintwork #276

Merged
merged 5 commits into from
May 26, 2014
Merged

Lintwork #276

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
47d8609
build include path 'include' does not exist
jihoonl May 22, 2014
2818bc7
unconfigured build_depend on 'rostest
jihoonl May 22, 2014
530a507
rocon_gateway_utils missing COMPONENTS keyword before 'rosunit rostest
jihoonl May 22, 2014
cbd3613
rocon_gateway_tests: CMakeLists.txt(12): error: missing COMPONENTS ke…
jihoonl May 22, 2014
4078977
adding back the rostest in rocon_test
jihoonl May 26, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion experiments/rocon_unreliable_experiments/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ project(rocon_unreliable_experiments)
##############################################################################

find_package(catkin REQUIRED COMPONENTS roscpp std_msgs)
include_directories(SYSTEM include ${catkin_INCLUDE_DIRS})
include_directories(SYSTEM ${catkin_INCLUDE_DIRS})
catkin_package(CATKIN_DEPENDS roscpp std_msgs)

##############################################################################
Expand Down
2 changes: 1 addition & 1 deletion rocon_gateway_tests/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ project(rocon_gateway_tests)
# Catkin
##############################################################################

find_package(catkin REQUIRED rocon_test)
find_package(catkin REQUIRED COMPONENTS rocon_test)
catkin_package()

catkin_python_setup()
Expand Down
2 changes: 1 addition & 1 deletion rocon_gateway_utils/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ catkin_python_setup()
##############################################################################

if (CATKIN_ENABLE_TESTING)
find_package(catkin REQUIRED rosunit rostest)
find_package(catkin REQUIRED COMPONENTS rosunit rostest)
add_subdirectory(tests)
endif()

Expand Down
4 changes: 1 addition & 3 deletions rocon_test/package.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,11 @@

<buildtool_depend>catkin</buildtool_depend>

<build_depend>rostest</build_depend>

<run_depend>rospy</run_depend>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As far as I know, this build_depend is essential ( see here). Is there a reason I'm not aware of that this is disappearing?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah. You should be correct. catkin_lint complains that CMakeList does not have rostest even if it is in build_depend.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

added back.

<run_depend>rostest</run_depend>
<run_depend>rosunit</run_depend>
<run_depend>rocon_console</run_depend>
<run_depend>rocon_python_utils</run_depend>
<run_depend>roslaunch</run_depend>
<run_depend>rocon_launch</run_depend>
</package>
</package>