Skip to content
This repository has been archived by the owner on Aug 3, 2020. It is now read-only.

Fix rostest dependency. #191

Merged
merged 1 commit into from
Mar 21, 2017
Merged

Conversation

mikepurvis
Copy link
Member

@mikepurvis mikepurvis commented Mar 20, 2017

Fix issue reported in #190, introduced in #177.

FYI @tspicer01 @alextoind @sloretz

@@ -9,7 +9,7 @@ install(PROGRAMS joint_state_publisher/joint_state_publisher DESTINATION ${CATKI


if(CATKIN_ENABLE_TESTING)
find_package(catkin REQUIRED COMPONENTS rostest)
find_package(rostest)
Copy link
Member Author

Choose a reason for hiding this comment

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

You shouldn't re-find catkin. Just find the additional package you need separately.

@@ -13,12 +13,9 @@

<buildtool_depend>catkin</buildtool_depend>

<build_depend>rospy</build_depend>
<build_depend>python_qt_binding</build_depend>
<build_depend>sensor_msgs</build_depend>
Copy link
Member Author

Choose a reason for hiding this comment

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

No need to build-depend on these; they aren't used at build time.

@clalancette
Copy link
Contributor

This looks OK to me (and makes the package more similar to other ones I've looked at), so I'm going to merge it. I still don't completely understand the situation that this causes problems in, so some feedback on how exactly the previous code causes problems would just help me understand better. Thanks!

@clalancette clalancette merged commit 481bde2 into ros:kinetic-devel Mar 21, 2017
@mikepurvis mikepurvis deleted the fix-190 branch March 21, 2017 14:27
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants