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

add separate option CATKIN_INSTALL_INTO_PREFIX_ROOT #940

Merged
merged 1 commit into from May 31, 2018

Conversation

Projects
None yet
2 participants
@dirk-thomas
Member

dirk-thomas commented May 30, 2018

The existing option CATKIN_BUILD_BINARY_PACKAGE is being used in the generated Debian rules files (except for catkin itself). Currently that flag has two effects:

When building ROS 1 packages with colcon the second side effect is desired when building with --merge-install but the first one is not. In order to select that combination this patch introduces a new flag named CATKIN_INSTALL_INTO_PREFIX_ROOT. The value of this new variable is being initialized based on the value of the existing variable CATKIN_BUILD_BINARY_PACKAGE (in case it is not being passed explicitly from the command line). This allows colcon-ros to pass -DCATKIN_INSTALL_INTO_PREFIX_ROOT=0 while still keeping tests enabled (see colcon/colcon-ros#11).

@tfoote

tfoote approved these changes May 30, 2018

@dirk-thomas dirk-thomas merged commit f359542 into kinetic-devel May 31, 2018

5 checks passed

Kpr__catkin__ubuntu_xenial_amd64 Build finished.
Details
Lpr__catkin__ubuntu_xenial_amd64 Build finished.
Details
Mpr__catkin__ubuntu_bionic_amd64 Build finished.
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
continuous-integration/travis-ci/push The Travis CI build passed
Details

@dirk-thomas dirk-thomas deleted the option_install_into_prefix_root branch May 31, 2018

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment