This repository was archived by the owner on May 31, 2025. It is now read-only.
add separate option CATKIN_INSTALL_INTO_PREFIX_ROOT#940
Merged
dirk-thomas merged 1 commit intokinetic-develfrom May 31, 2018
Merged
add separate option CATKIN_INSTALL_INTO_PREFIX_ROOT#940dirk-thomas merged 1 commit intokinetic-develfrom
dirk-thomas merged 1 commit intokinetic-develfrom
Conversation
tfoote
approved these changes
May 30, 2018
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 subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
The existing option
CATKIN_BUILD_BINARY_PACKAGEis being used in the generated Debian rules files (except forcatkinitself). Currently that flag has two effects:catkin/cmake/test/tests.cmake
Line 47 in cbe8368
catkin/cmake/all.cmake
Line 197 in cbe8368
catkin/cmake/catkin_generate_environment.cmake
Line 77 in cbe8368
When building ROS 1 packages with
colconthe second side effect is desired when building with--merge-installbut the first one is not. In order to select that combination this patch introduces a new flag namedCATKIN_INSTALL_INTO_PREFIX_ROOT. The value of this new variable is being initialized based on the value of the existing variableCATKIN_BUILD_BINARY_PACKAGE(in case it is not being passed explicitly from the command line). This allowscolcon-rosto pass-DCATKIN_INSTALL_INTO_PREFIX_ROOT=0while still keeping tests enabled (see colcon/colcon-ros#11).