Minimal logic for windows build with groovy catkin #10
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This was referenced Mar 12, 2013
| @@ -28,12 +28,13 @@ | |||
| #ifndef ROSPACK_ROSPACK_CMDLINE_H | |||
| #define ROSPACK_ROSPACK_CMDLINE_H | |||
|
|
|||
| #include "../include/rospack/macros.h" | |||
There was a problem hiding this comment.
Please do not use relative imports for that. Since the include folder is added as include_directories you should just include "rospack/macros.h" (the same as the other headers files in the include folder).
Same in "utils.h" later.
There was a problem hiding this comment.
Updated in c05fd15 and added to the pull request.
|
Looks good. Can you please squash your commits before the merge? Either into two commits (one for windows macro stuff and one for tinyxml stuff) or one big commit if more convenient. |
|
That was cool - I didn't know you could selectively squash commits like that. |
dirk-thomas
added a commit
that referenced
this pull request
Apr 11, 2013
Minimal logic for windows build with groovy catkin
PierrickKoch
referenced
this pull request
in PierrickKoch/robotpkg
Feb 21, 2014
While here, rename the package to ros-rospack, for consistency with other ros packages. The ChangeLog since 2.0.13 stops at the "groovy" boundary. 2.1.19 (2013-06-06) ------------------- * modified command 'list-duplicates' to output the paths where the packages were found (`#3 <https://github.com/ros/rospack/issues/3>`_) * modified 'rospack plugins' to not use rosdep (`#5 <https://github.com/ros/rospack/issues/5>`_) * improve Windows support (`#10 <https://github.com/ros/rospack/issues/10>`_) * use find_package() for tinyxml (if available) 2.1.18 (2013-03-21) ------------------- * invert order of package type detection (dry before wet) (`ros-infrastructure/rospkg#30 <https://github.com/ros/rospkg/issues/30>`_) 2.1.17 (2013-03-08) ------------------- * output full pkg-config command in case of errors (`#8 <https://github.com/ros/rospack/issues/8>`_) * handle None as return value for call_pkg_config (`#8 <https://github.com/ros/rospack/issues/8>`_) * fix crawling to always recrawl when forced (`#9 <https://github.com/ros/rospack/issues/9>`_) 2.1.16 (2013-01-13) ------------------- * fix segfault for command depends1 which ignores exceptions and calls isSysPackage again (`#4 <https://github.com/ros/rospack/issues/4>`_) 2.1.15 (2012-12-06) ------------------- * first public release for Groovy
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Adds the following for a windows build:
Ros and rospack stacks finally building with groovy catkin!