Ability to build survive_publisher using catkin#309
Open
kbrameld wants to merge 4 commits intocollabora:masterfrom
Open
Ability to build survive_publisher using catkin#309kbrameld wants to merge 4 commits intocollabora:masterfrom
kbrameld wants to merge 4 commits intocollabora:masterfrom
Conversation
…catkin_tools to build survive_publisher
…, executables don't get compiled into the devel directory correctly
kbrameld
changed the title
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
Revive the
survive_in_catkin_makebuild property, for the ability to use catkin_tools to build survive_publisher. Property was originally added in 42bfce9, but functionality was lost during CMakeLists.txt refactor, whether intentional or not. With this change, libsurvive can be put in a catkin workspace, and be built simply by runningcatkin build. Without this change, the CMakeLists.txt will have a circular inclusion and fail to build.Also,
catkin_package()must be called before any targets are added withadd_executable, so that has been moved further up in theCMakeLists.txt. Quoting ROS Wiki catkin - 6. catkin_package - "This function (catkin_package) must be called before declaring any targets with add_library() or add_executable()". Currently, with catkin_package being called after add_executable, the executables aren't built into the catkindevel/space as expected.