diff options
| author | Curtis J Bezault <curtbezault@gmail.com> | 2019-08-16 13:51:22 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-08-16 13:51:22 -0700 |
| commit | b47ca1b01267624f908ac82b9f03ef7d941a6a11 (patch) | |
| tree | 57a138d3965cbc04e19d9a7b16d51f8d173af065 /toolsrc/include | |
| parent | dd8e95af87949680f19289a6b3ac6882bf139c54 (diff) | |
| parent | c605f4eea632878dc495fd280a41734bd14e851f (diff) | |
| download | vcpkg-b47ca1b01267624f908ac82b9f03ef7d941a6a11.tar.gz vcpkg-b47ca1b01267624f908ac82b9f03ef7d941a6a11.zip | |
Merge pull request #7305 from cbezault/external_file_abi
[vcpkg] Public ABI override option
Diffstat (limited to 'toolsrc/include')
| -rw-r--r-- | toolsrc/include/vcpkg/binaryparagraph.h | 2 | ||||
| -rw-r--r-- | toolsrc/include/vcpkg/build.h | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/toolsrc/include/vcpkg/binaryparagraph.h b/toolsrc/include/vcpkg/binaryparagraph.h index 7734859f7..457205384 100644 --- a/toolsrc/include/vcpkg/binaryparagraph.h +++ b/toolsrc/include/vcpkg/binaryparagraph.h @@ -4,8 +4,6 @@ #include <vcpkg/parse.h> #include <vcpkg/sourceparagraph.h> -#include <unordered_map> - namespace vcpkg { /// <summary> diff --git a/toolsrc/include/vcpkg/build.h b/toolsrc/include/vcpkg/build.h index c57cbfad3..cd1821b32 100644 --- a/toolsrc/include/vcpkg/build.h +++ b/toolsrc/include/vcpkg/build.h @@ -137,6 +137,8 @@ namespace vcpkg::Build Optional<fs::path> visual_studio_path; Optional<std::string> external_toolchain_file; Optional<ConfigurationType> build_type; + Optional<std::string> public_abi_override; + Optional<const SourceControlFileLocation&> port; std::vector<std::string> passthrough_env_vars; }; @@ -152,6 +154,7 @@ namespace vcpkg::Build CHAINLOAD_TOOLCHAIN_FILE, BUILD_TYPE, ENV_PASSTHROUGH, + PUBLIC_ABI_OVERRIDE, }; const std::unordered_map<std::string, VcpkgTripletVar> VCPKG_OPTIONS = { @@ -163,6 +166,7 @@ namespace vcpkg::Build {"VCPKG_CHAINLOAD_TOOLCHAIN_FILE", VcpkgTripletVar::CHAINLOAD_TOOLCHAIN_FILE}, {"VCPKG_BUILD_TYPE", VcpkgTripletVar::BUILD_TYPE}, {"VCPKG_ENV_PASSTHROUGH", VcpkgTripletVar::ENV_PASSTHROUGH}, + {"VCPKG_PUBLIC_ABI_OVERRIDE", VcpkgTripletVar::PUBLIC_ABI_OVERRIDE}, }; struct ExtendedBuildResult |