Skip to content
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

ign -> gz Header Migration : ign-utils (2) #55

Merged
merged 5 commits into from
Apr 29, 2022
Merged

Conversation

methylDragon
Copy link
Contributor

See: gazebo-tooling/release-tools#712

Fixes a missing ignition header install.

@scpeters
Copy link
Member

follow-up to #53

@scpeters
Copy link
Member

should this be rebased on main?

install(DIRECTORY ignition DESTINATION ${IGN_INCLUDE_INSTALL_DIR_FULL})
install(DIRECTORY external-cli/ignition DESTINATION ${IGN_INCLUDE_INSTALL_DIR_FULL})
install(DIRECTORY vendored-cli/ignition DESTINATION ${IGN_INCLUDE_INSTALL_DIR_FULL})
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

two problems:

  • only one of these should be installed, never both, so this install logic needs to be inside the if/else block
  • the external-cli and vendored-cli folders should never be part of the install path. I'm guessing we should add a CMakeLists.txt inside each subfolder that contains install(DIRECTORY ignition ... and add_subdirectory(gz/utils)

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Branch rebased, install logic fixed

50f8dbd

CI is green!

@methylDragon methylDragon force-pushed the header_migration branch 2 times, most recently from fbeae9c to 31e0ea5 Compare April 28, 2022 21:58
@scpeters
Copy link
Member

@methylDragon methylDragon marked this pull request as draft April 28, 2022 23:55
Signed-off-by: methylDragon <[email protected]>
@methylDragon methylDragon marked this pull request as ready for review April 29, 2022 00:31
@methylDragon methylDragon force-pushed the header_migration branch 3 times, most recently from 5859f77 to 3ecdccb Compare April 29, 2022 01:15
@scpeters
Copy link
Member

I think this one can be squash-merged

@methylDragon methylDragon merged commit b802e60 into main Apr 29, 2022
@methylDragon methylDragon deleted the header_migration branch April 29, 2022 02:09
@chapulina chapulina added the ign to gz Renaming Ignition to Gazebo. label May 11, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
🌱 garden Ignition Garden ign to gz Renaming Ignition to Gazebo.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants