Skip to content

Install includes to include/${PROJECT_NAME} and misc CMake fixes#12

Merged
christophebedard merged 2 commits intoros-tooling:mainfrom
sloretz:sloretz__easy_idso_part1
Jan 25, 2022
Merged

Install includes to include/${PROJECT_NAME} and misc CMake fixes#12
christophebedard merged 2 commits intoros-tooling:mainfrom
sloretz:sloretz__easy_idso_part1

Conversation

@sloretz
Copy link
Copy Markdown
Contributor

@sloretz sloretz commented Jan 5, 2022

Part of ros2/ros2#1150

This installs includes to include/${PROJECT_NAME} to mitigate include directory search order issues when overriding packages in desktop.

Part of ament/ament_cmake#365

This removes ament_export_libraries and ament_export_include_directories as they're redundant with the exported CMake targets. Edit: added back old-style CMake variables to minimize disruption

Signed-off-by: Shane Loretz <sloretz@osrfoundation.org>
@sloretz sloretz requested a review from a team as a code owner January 5, 2022 22:10
@sloretz sloretz requested review from christophebedard and emersonknapp and removed request for a team January 5, 2022 22:10
@sloretz sloretz marked this pull request as draft January 5, 2022 22:10
@sloretz sloretz marked this pull request as ready for review January 11, 2022 19:07
@sloretz
Copy link
Copy Markdown
Contributor Author

sloretz commented Jan 14, 2022

Uncrustify failure appears to be due to changes in c0014bf that satisfy Uncrustify 0.72, but don't satisfy 0.69. That will be fixed whenever uncrustify_vendor gets a new rolling release. Since the code in question isn't changed by this PR, CI LGTM

Signed-off-by: Shane Loretz <sloretz@openrobotics.org>
@sloretz
Copy link
Copy Markdown
Contributor Author

sloretz commented Jan 21, 2022

CI (repos file build: --packages-above-and-dependencies keyboard_handler test: --packages-above keyboard_handler)

  • Linux Build Status
  • Linux-aarch64 Build Status
  • Windows Build Status

@sloretz
Copy link
Copy Markdown
Contributor Author

sloretz commented Jan 25, 2022

@emersonknapp would you be willing to merge this PR? I don't have write access to this repo

@christophebedard
Copy link
Copy Markdown
Member

Everything seems to be in order so I'll just merge it!

@christophebedard christophebedard merged commit ab048b9 into ros-tooling:main Jan 25, 2022
@sloretz sloretz deleted the sloretz__easy_idso_part1 branch January 25, 2022 22:04
@clalancette clalancette mentioned this pull request Mar 28, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants