[vcpkg] Portfile Settings #7292
Merged
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
vicroms
requested changes
Jul 18, 2019
toolsrc/src/vcpkg/build.cpp
Outdated
| { | ||
| args.emplace_back( | ||
| "CMAKE_PORT_SETTINGS", | ||
| paths.ports / port.value_or_exit(VCPKG_LINE_INFO) / "port-settings.cmake"); |
There was a problem hiding this comment.
This won't work with overlay ports, it will always resolve to <vcpkg_root>/ports/<port>/port-settings.cmake.
You can get the correct port directory from BuildPackageConfig.config.ports_dir which seems to be available from all calling sites.
There was a problem hiding this comment.
Yikes. This seems like a trap people can fall into easily
There was a problem hiding this comment.
Yes, probably should rename the variables in VcpkgPaths
ports->default_portstriplets->default_triplets
or something similar.
There was a problem hiding this comment.
I think I'm just going to change the build config to contain a SourceControlFileLocation.
vicroms
reviewed
Jul 18, 2019
vicroms
approved these changes
Jul 19, 2019
Rastaban
approved these changes
Jul 19, 2019
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.
This PR allows you to add a
port-settings.cmakefile to a port to override settings defined in the triplet globally or to define settings which govern the behavior of the vpckg binary on a per port basis.Written on top of #7290