-
Notifications
You must be signed in to change notification settings - Fork 1.8k
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.
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
Fix CMakeLists + package.xmls #548
Conversation
@mintar Were there no complaints about |
@spmaniato I didn't even run Some more remarks (they may be obvious, but nevertheless):
|
Ping |
Hello, these changes haven't released yet, right? I just upgrade the ros-indigo-navigation, but the version is: 1.12.13-0trusty-20161128-101040-0800. And still have ros java problem :( |
@caicaixia : No, I'm still waiting for this PR to be merged. But this bug only concerns source installs anyway, so it doesn't matter if this is released or not. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Overall, looks good. I merged things in the wrong order (see #549), so could you please merge the latest indigo-devel?
@@ -60,8 +61,6 @@ generate_dynamic_reconfigure_options( | |||
catkin_package( | |||
INCLUDE_DIRS | |||
include | |||
${EIGEN_INCLUDE_DIRS} | |||
${PCL_INCLUDE_DIRS} |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Why are these removed?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Because there already is a catkin_package(DEPENDS PCL Eigen). This means that PCL + Eigen are already added as dependencies for any project that depends on costmap_2d
, and it's Eigen's (resp. PCL's) job to export their own include dirs. The catkin_package(INCLUDE_DIRS)
should only export our own include dirs.
Removing these two lines makes the following catkin_lint
error go away:
costmap_2d: CMakeLists.txt(61): error: catkin_package() exports non-package include path
* You listed one or more include paths in the INCLUDE_DIRS stanza
* of your catkin_package() call which are not part of your
* package. If you want to export include paths of other modules,
* use find_package(), find_path(), and/or find_library() and add
* the dependency to the DEPENDS stanza.
I've rebased this branch onto the latest indigo-devel, so it should be good to merge. |
I've just added two more commits that fix 87 out of 90 |
@mintar -- could you rebase this on top of latest changes (there is a conflict) and then we can get this merged. Thanks! |
This fixes compilation errors when rosjava is installed on the system. It also removes a lot of errors reported by catkin_lint. Fixes ros-planning#537 .
This fixes the following catkin_lint warning: amcl: warning: include paths 'include/amcl/map' and 'include' are ambiguous * You have used two include paths where one is a parent of the * other. Thus the same headers can be included with two different * include paths which may confuse users. It is recommended that * you keep your include paths consistent.
@mikeferguson Ok, rebased! |
ping |
Test failures are unrelated. I'm going to squash-merge to make it easier to forward port to K+L |
* Fix CMakeLists + package.xmls This fixes compilation errors when rosjava is installed on the system. It also removes a lot of errors reported by catkin_lint. Fixes #537 . * Fix more CMakeLists.txt + package.xmls * amcl: disambiguate include path This fixes the following catkin_lint warning: amcl: warning: include paths 'include/amcl/map' and 'include' are ambiguous * You have used two include paths where one is a parent of the * other. Thus the same headers can be included with two different * include paths which may confuse users. It is recommended that * you keep your include paths consistent.
* Fix CMakeLists + package.xmls This fixes compilation errors when rosjava is installed on the system. It also removes a lot of errors reported by catkin_lint. Fixes #537 . * Fix more CMakeLists.txt + package.xmls * amcl: disambiguate include path This fixes the following catkin_lint warning: amcl: warning: include paths 'include/amcl/map' and 'include' are ambiguous * You have used two include paths where one is a parent of the * other. Thus the same headers can be included with two different * include paths which may confuse users. It is recommended that * you keep your include paths consistent.
* Fix CMakeLists + package.xmls This fixes compilation errors when rosjava is installed on the system. It also removes a lot of errors reported by catkin_lint. Fixes #537 . * Fix more CMakeLists.txt + package.xmls * amcl: disambiguate include path This fixes the following catkin_lint warning: amcl: warning: include paths 'include/amcl/map' and 'include' are ambiguous * You have used two include paths where one is a parent of the * other. Thus the same headers can be included with two different * include paths which may confuse users. It is recommended that * you keep your include paths consistent.
* Fix CMakeLists + package.xmls This fixes compilation errors when rosjava is installed on the system. It also removes a lot of errors reported by catkin_lint. Fixes #537 . * Fix more CMakeLists.txt + package.xmls * amcl: disambiguate include path This fixes the following catkin_lint warning: amcl: warning: include paths 'include/amcl/map' and 'include' are ambiguous * You have used two include paths where one is a parent of the * other. Thus the same headers can be included with two different * include paths which may confuse users. It is recommended that * you keep your include paths consistent.
* Fix CMakeLists + package.xmls This fixes compilation errors when rosjava is installed on the system. It also removes a lot of errors reported by catkin_lint. Fixes #537 . * Fix more CMakeLists.txt + package.xmls * amcl: disambiguate include path This fixes the following catkin_lint warning: amcl: warning: include paths 'include/amcl/map' and 'include' are ambiguous * You have used two include paths where one is a parent of the * other. Thus the same headers can be included with two different * include paths which may confuse users. It is recommended that * you keep your include paths consistent.
* Fix CMakeLists + package.xmls This fixes compilation errors when rosjava is installed on the system. It also removes a lot of errors reported by catkin_lint. Fixes #537 . * Fix more CMakeLists.txt + package.xmls * amcl: disambiguate include path This fixes the following catkin_lint warning: amcl: warning: include paths 'include/amcl/map' and 'include' are ambiguous * You have used two include paths where one is a parent of the * other. Thus the same headers can be included with two different * include paths which may confuse users. It is recommended that * you keep your include paths consistent.
* Fix CMakeLists + package.xmls This fixes compilation errors when rosjava is installed on the system. It also removes a lot of errors reported by catkin_lint. Fixes #537 . * Fix more CMakeLists.txt + package.xmls * amcl: disambiguate include path This fixes the following catkin_lint warning: amcl: warning: include paths 'include/amcl/map' and 'include' are ambiguous * You have used two include paths where one is a parent of the * other. Thus the same headers can be included with two different * include paths which may confuse users. It is recommended that * you keep your include paths consistent.
Hooray! :-) |
* Fix CMakeLists + package.xmls This fixes compilation errors when rosjava is installed on the system. It also removes a lot of errors reported by catkin_lint. Fixes ros-planning#537 . * Fix more CMakeLists.txt + package.xmls * amcl: disambiguate include path This fixes the following catkin_lint warning: amcl: warning: include paths 'include/amcl/map' and 'include' are ambiguous * You have used two include paths where one is a parent of the * other. Thus the same headers can be included with two different * include paths which may confuse users. It is recommended that * you keep your include paths consistent.
* Fix CMakeLists + package.xmls This fixes compilation errors when rosjava is installed on the system. It also removes a lot of errors reported by catkin_lint. Fixes ros-planning#537 . * Fix more CMakeLists.txt + package.xmls * amcl: disambiguate include path This fixes the following catkin_lint warning: amcl: warning: include paths 'include/amcl/map' and 'include' are ambiguous * You have used two include paths where one is a parent of the * other. Thus the same headers can be included with two different * include paths which may confuse users. It is recommended that * you keep your include paths consistent.
This fixes compilation errors when rosjava is installed on the system.
It also removes a lot of errors reported by catkin_lint.
Fixes #537 .