Fix support for toolchains that set CMAKE_FIND_ROOT_PATH_MODE_* variables to ONLY #11753
Conversation
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
|
/azp run |
|
Azure Pipelines successfully started running 1 pipeline(s). |
|
Need to test that this does not affect other triplets. |
Hi @vicroms, I did a few tests and also other triplets were working correctly, which kind of tests do you have in mind? There is something I can do? Thanks! |
aa680a9 to
36419bf
Compare
|
To test with a recent version of vcpkg, I rebased the branch on the top of existing master. |
|
This LGTM. Thanks for continuing to improve wasm, looking forward to someday having it in CI :D |
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.
The vcpkg toolchain in
scripts/buildsystems/vcpkg.cmakeadds the installation prefixes toCMAKE_FIND_ROOT_PATH, but that directory is not searched directly byfind_package, but it is prepended to all the usual search paths (for example the one specified byCMAKE_PREFIX_PATH). To make sure thatfind_packagesearch in the directory specified inCMAKE_FIND_ROOT_PATHeven ifCMAKE_FIND_ROOT_PATHis set toONLY, it is necessary to also add/toCMAKE_PREFIX_PATH.This PR ensure that:
works fine, and in general is necessary for any
wasm32-emscriptenport that find its dependencies viafind_package, as discussed in #11323 (comment) . It probably also fixes #8216, but I did not tested it.Which triplets are supported/not supported? Have you updated the CI baseline?
This fix was developed for ports of the
wasm32-emscriptentriplets, but it probably also applies to other triplets, but it should not affect any officially supported triplet.Does your PR follow the maintainer guide?
Yes.