diff options
| author | Curtis.Bezault <curtbezault@gmail.com> | 2019-08-09 14:21:58 -0700 |
|---|---|---|
| committer | Curtis.Bezault <curtbezault@gmail.com> | 2019-08-09 14:21:58 -0700 |
| commit | 0c7d8f414669c6e025794c374f2837e5fa24d02b (patch) | |
| tree | 79324956501e2dce1b5032da310bb123b1322010 /toolsrc/include | |
| parent | c4f1a91ef245ed3e44ea11f13040a77453126165 (diff) | |
| download | vcpkg-0c7d8f414669c6e025794c374f2837e5fa24d02b.tar.gz vcpkg-0c7d8f414669c6e025794c374f2837e5fa24d02b.zip | |
Change purpose of this PR to just overriding the abi
Diffstat (limited to 'toolsrc/include')
| -rw-r--r-- | toolsrc/include/vcpkg/binaryparagraph.h | 12 | ||||
| -rw-r--r-- | toolsrc/include/vcpkg/build.h | 7 |
2 files changed, 4 insertions, 15 deletions
diff --git a/toolsrc/include/vcpkg/binaryparagraph.h b/toolsrc/include/vcpkg/binaryparagraph.h index a68fcfb36..0fbd382fa 100644 --- a/toolsrc/include/vcpkg/binaryparagraph.h +++ b/toolsrc/include/vcpkg/binaryparagraph.h @@ -8,13 +8,6 @@ namespace vcpkg { - enum class ConsistencyState : unsigned - { - UNKNOWN = 0, - CONSISTENT, - INCONSISTENT, - }; - /// <summary> /// Built package metadata /// </summary> @@ -31,8 +24,6 @@ namespace vcpkg std::string dir() const; - bool is_consistent() const; - PackageSpec spec; std::string version; std::string description; @@ -41,9 +32,6 @@ namespace vcpkg std::vector<std::string> default_features; std::vector<std::string> depends; std::string abi; - std::map<fs::path, std::string> external_files; - - mutable ConsistencyState consistency = ConsistencyState::UNKNOWN; }; struct BinaryControlFile diff --git a/toolsrc/include/vcpkg/build.h b/toolsrc/include/vcpkg/build.h index c393d989b..cd1821b32 100644 --- a/toolsrc/include/vcpkg/build.h +++ b/toolsrc/include/vcpkg/build.h @@ -137,8 +137,9 @@ 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; - std::vector<std::pair<fs::path, std::string>> external_files; }; std::string make_build_env_cmd(const PreBuildInfo& pre_build_info, const Toolset& toolset); @@ -153,7 +154,7 @@ namespace vcpkg::Build CHAINLOAD_TOOLCHAIN_FILE, BUILD_TYPE, ENV_PASSTHROUGH, - EXTERNAL_FILES, + PUBLIC_ABI_OVERRIDE, }; const std::unordered_map<std::string, VcpkgTripletVar> VCPKG_OPTIONS = { @@ -165,7 +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_EXTERNAL_FILES", VcpkgTripletVar::EXTERNAL_FILES}, + {"VCPKG_PUBLIC_ABI_OVERRIDE", VcpkgTripletVar::PUBLIC_ABI_OVERRIDE}, }; struct ExtendedBuildResult |