[folly] Fix fatal error in folly-config.cmake #3747
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
facebook/folly@10d1edd makes two simultaneous changes: 1. It uses a different mechanism for setting `FOLLY_CMAKE_DIR`, which confuses `vcpkg_fixup_cmake_targets` so the path isn't rewritten. 2. It introduces `set_and_check` validation on `FOLLY_CMAKE_DIR`, which causes a fatal cmake error if the path is missing. The combination of these two changes is that folly-config.cmake produces a fatal error when executed. This PR tweaks folly's build params and the `vcpkg_fixup_cmake_targets` arguments so things are rewritten correctly and everything works again.
tessro
force-pushed
the
fix-folly-cmake-config
branch
from
88ad5e8
to
4a9d6ac
Compare
|
Thanks for the fix and thanks for the explanation :)! |
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.
facebook/folly@10d1edd makes two simultaneous changes:
FOLLY_CMAKE_DIR, which confusesvcpkg_fixup_cmake_targetsso the path isn't rewritten.set_and_checkvalidation onFOLLY_CMAKE_DIR, which causes a fatal cmake error if the path is missing.The combination of these two changes is that folly-config.cmake produces a fatal error when executed.
This PR tweaks folly's build params and the
vcpkg_fixup_cmake_targetsarguments so things are rewritten correctly and everything works again.