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 Migrate Ignition Headers : gz-cmake #303

Merged
merged 2 commits into from
Aug 29, 2022

Conversation

methylDragon
Copy link
Contributor

@github-actions github-actions bot added 🏯 fortress Ignition Fortress 🏰 citadel Ignition Citadel labels Aug 12, 2022
@chapulina chapulina added the ign to gz Renaming Ignition to Gazebo. label Aug 15, 2022
@methylDragon methylDragon force-pushed the citadel_header_redirects branch 9 times, most recently from 8d87909 to 28e8448 Compare August 19, 2022 03:47
CMakeLists.txt Outdated
ign_configure_project(VERSION_SUFFIX)
ign_configure_project(
REPLACE_IGNITION_INCLUDE_PATH gz/cmake
VERSION_SUFFIX pre1
Copy link
Member

Choose a reason for hiding this comment

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

are we planning to make a prerelease?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Oh, I thought the missing VERSION_SUFFIX was a bug :X
Let me remove

*/

#ifndef IGNITION_UTILITIES_EXTRATESTMACROS_HH
#define IGNITION_UTILITIES_EXTRATESTMACROS_HH
Copy link
Member

Choose a reason for hiding this comment

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

use GZ_* for these header guards?

Copy link
Member

@scpeters scpeters left a comment

Choose a reason for hiding this comment

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

I think the header guards and include path need to be updated in include/gz/utilities/detail/ExtraTestMacros.hh as well

#ifndef IGNITION_UTILITIES_DETAIL_SUPPRESSWARNING_HH_
#define IGNITION_UTILITIES_DETAIL_SUPPRESSWARNING_HH_
#ifndef GZ_UTILITIES_DETAIL_SUPPRESSWARNING_HH_
#define GZ_UTILITIES_DETAIL_SUPPRESSWARNING_HH_

#include <ignition/utilities/SuppressWarning.hh>
Copy link
Member

Choose a reason for hiding this comment

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

#include <gz/

@methylDragon methylDragon force-pushed the citadel_header_redirects branch from 28e8448 to 532f347 Compare August 19, 2022 19:22
@methylDragon methylDragon changed the title ign -> gz Reverse Ignition Headers : gz-cmake ign -> gz Migrate Ignition Headers : gz-cmake Aug 22, 2022
Copy link
Member

@scpeters scpeters left a comment

Choose a reason for hiding this comment

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

@scpeters
Copy link
Member

@methylDragon do you mind merging this? I think you have a specific procedure involving rebase-and-merge. I'll take care of the release afterwards

Signed-off-by: methylDragon <methylDragon@gmail.com>
Signed-off-by: methylDragon <methylDragon@gmail.com>
@methylDragon methylDragon force-pushed the citadel_header_redirects branch from 532f347 to bf73342 Compare August 29, 2022 20:47
@methylDragon methylDragon enabled auto-merge (rebase) August 29, 2022 20:47
@methylDragon methylDragon merged commit 4dcb5b4 into ign-cmake2 Aug 29, 2022
@methylDragon methylDragon deleted the citadel_header_redirects branch August 29, 2022 20:53
methylDragon added a commit that referenced this pull request Aug 29, 2022
Signed-off-by: methylDragon <methylDragon@gmail.com>
@scpeters scpeters mentioned this pull request Aug 31, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
🏰 citadel Ignition Citadel 🏯 fortress Ignition Fortress ign to gz Renaming Ignition to Gazebo.
Projects
Archived in project
Development

Successfully merging this pull request may close these issues.

3 participants