-
Notifications
You must be signed in to change notification settings - Fork 10
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
Conversation
This file contains 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
methylDragon
force-pushed
the
header_migration
branch
from
April 28, 2022 21:15
9267659
to
818e5cb
Compare
follow-up to #53 |
should this be rebased on |
scpeters
reviewed
Apr 28, 2022
cli/include/CMakeLists.txt
Outdated
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}) |
There was a problem hiding this comment.
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
andvendored-cli
folders should never be part of the install path. I'm guessing we should add aCMakeLists.txt
inside each subfolder that containsinstall(DIRECTORY ignition ...
andadd_subdirectory(gz/utils)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
methylDragon
force-pushed
the
header_migration
branch
from
April 28, 2022 21:54
c731b32
to
c2f41bf
Compare
Signed-off-by: methylDragon <[email protected]>
Signed-off-by: methylDragon <[email protected]>
methylDragon
force-pushed
the
header_migration
branch
2 times, most recently
from
April 28, 2022 21:58
fbeae9c
to
31e0ea5
Compare
Signed-off-by: methylDragon <[email protected]>
methylDragon
force-pushed
the
header_migration
branch
2 times, most recently
from
April 28, 2022 22:19
febac36
to
501cd41
Compare
I noticed two more issues with redirect headers: |
Signed-off-by: methylDragon <[email protected]>
methylDragon
force-pushed
the
header_migration
branch
from
April 28, 2022 23:58
501cd41
to
7348ea2
Compare
Signed-off-by: methylDragon <[email protected]>
methylDragon
force-pushed
the
header_migration
branch
from
April 29, 2022 00:10
aec697d
to
3ecdccb
Compare
methylDragon
force-pushed
the
header_migration
branch
3 times, most recently
from
April 29, 2022 01:15
5859f77
to
3ecdccb
Compare
I think this one can be squash-merged |
scpeters
approved these changes
Apr 29, 2022
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
See: gazebo-tooling/release-tools#712
Fixes a missing ignition header install.