[vcpkg_fixup_cmake_targets] Add NO_PREFIX_CORRECTION#12215
Merged
strega-nil merged 6 commits intomicrosoft:masterfrom Nov 25, 2020
Merged
[vcpkg_fixup_cmake_targets] Add NO_PREFIX_CORRECTION#12215strega-nil merged 6 commits intomicrosoft:masterfrom
strega-nil merged 6 commits intomicrosoft:masterfrom
Conversation
JackBoosY
added
the
category:vcpkg-feature
| #original folder deepness to CURRENT_PACKAGES_DIR in comparison to the moved to folder deepness which | ||
| #is always at least (>=) 2, e.g. share/${PORT}. Currently the code assumes it is always 2 although | ||
| #this requirement is only true for the *Config.cmake. The targets are not required to be in the same | ||
| #folder as the *Config.cmake! |
Contributor
There was a problem hiding this comment.
It seems like it would be best to fix this to handle the targets case instead of adding a switch to disable and then needing to manually write the same fixup code in every port that uses said switch. Do you have an idea of how difficult that would be?
Contributor
Author
There was a problem hiding this comment.
Calculate relative path from CURRENT_PACKAGES_DIR/<targetfilelocation> to CURRENT_PACKAGES_DIR and count the backticks /.. do the same for CURRENT_PACKAGES_DIR/<newtargetfilelocation> to CURRENT_PACKAGES_DIR and also count the /...
The first count gives the number of get_filename_component to replace while the later defines the number of get_filename_component required. If the count is equal no replacement is necessary. It is not too difficult but probably requires a ton of try and error to just get it to work correctly.
I just added NO_PREFIX_CORRECTION as a quick fix since I need it for one of my personal ports. You can always deprecate the parameter later if you have the above mentioned fix. (And probably not a lot of ports require it.)
Co-authored-by: Robert Schumacher <[email protected]>
Contributor
|
waiting for merge #12458 . |
JackBoosY
added
the
depends:different-pr
Contributor
|
/azp run |
|
Azure Pipelines successfully started running 1 pipeline(s). |
JackBoosY
removed
the
depends:different-pr
Contributor
|
boost-iostreams: I can't get it, we already build itk:x64-osx: |
…e_prefix_correction # Conflicts: # scripts/cmake/vcpkg_fixup_cmake_targets.cmake
JackBoosY
approved these changes
Aug 18, 2020
JackBoosY
added
the
info:needs-maintainer-attention
BillyONeal
removed
the
info:needs-maintainer-attention
# Conflicts: # scripts/cmake/vcpkg_fixup_cmake_targets.cmake
Contributor
|
Merging as the errors are unrelated. |
This was referenced Dec 10, 2020
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
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.
In some cases the applied prefix correction of
vcpkg_fixup_cmake_targetsis wrong.The option
NO_PREFIX_CORRECTIONdeactivates the correction of the_IMPORT_PREFIX