diff options
| author | nicole mazzuca <mazzucan@outlook.com> | 2020-06-25 18:23:30 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-25 18:23:30 -0700 |
| commit | 22c8e3a23afc6be45020cd3f8c92bcea783ce8fa (patch) | |
| tree | 83c888602bc4a5970b603f4de9937fbea6c3d140 /toolsrc/include | |
| parent | f10c49281abbd42ff5aa9a0a3846d935c41b943a (diff) | |
| download | vcpkg-22c8e3a23afc6be45020cd3f8c92bcea783ce8fa.tar.gz vcpkg-22c8e3a23afc6be45020cd3f8c92bcea783ce8fa.zip | |
[vcpkg build] fix build command (#12072)
Diffstat (limited to 'toolsrc/include')
| -rw-r--r-- | toolsrc/include/vcpkg/build.h | 12 | ||||
| -rw-r--r-- | toolsrc/include/vcpkg/triplet.h | 10 |
2 files changed, 16 insertions, 6 deletions
diff --git a/toolsrc/include/vcpkg/build.h b/toolsrc/include/vcpkg/build.h index 68cfd7d23..e2e28b08a 100644 --- a/toolsrc/include/vcpkg/build.h +++ b/toolsrc/include/vcpkg/build.h @@ -37,12 +37,18 @@ namespace vcpkg::Build { namespace Command { + int perform_ex(const FullPackageSpec& full_spec, + const SourceControlFileLocation& scfl, + const PortFileProvider::PathsPortFileProvider& provider, + IBinaryProvider& binaryprovider, + const VcpkgPaths& paths); void perform_and_exit_ex(const FullPackageSpec& full_spec, const SourceControlFileLocation& scfl, const PortFileProvider::PathsPortFileProvider& provider, IBinaryProvider& binaryprovider, const VcpkgPaths& paths); + int perform(const VcpkgCmdArguments& args, const VcpkgPaths& paths, Triplet default_triplet); void perform_and_exit(const VcpkgCmdArguments& args, const VcpkgPaths& paths, Triplet default_triplet); } @@ -222,7 +228,7 @@ namespace vcpkg::Build struct BuildPolicies { BuildPolicies() = default; - BuildPolicies(std::map<BuildPolicy, bool>&& map) : m_policies(std::move(map)) {} + BuildPolicies(std::map<BuildPolicy, bool>&& map) : m_policies(std::move(map)) { } bool is_enabled(BuildPolicy policy) const { @@ -261,7 +267,7 @@ namespace vcpkg::Build std::string value; AbiEntry() = default; - AbiEntry(const std::string& key, const std::string& value) : key(key), value(value) {} + AbiEntry(const std::string& key, const std::string& value) : key(key), value(value) { } bool operator<(const AbiEntry& other) const { @@ -290,7 +296,7 @@ namespace vcpkg::Build struct EnvCache { - explicit EnvCache(bool compiler_tracking) : m_compiler_tracking(compiler_tracking) {} + explicit EnvCache(bool compiler_tracking) : m_compiler_tracking(compiler_tracking) { } const System::Environment& get_action_env(const VcpkgPaths& paths, const AbiInfo& abi_info); const std::string& get_triplet_info(const VcpkgPaths& paths, const AbiInfo& abi_info); diff --git a/toolsrc/include/vcpkg/triplet.h b/toolsrc/include/vcpkg/triplet.h index 92ea10175..4a88f5708 100644 --- a/toolsrc/include/vcpkg/triplet.h +++ b/toolsrc/include/vcpkg/triplet.h @@ -4,6 +4,8 @@ #include <vcpkg/base/system.h> #include <vcpkg/base/optional.h> +#include <vcpkg/vcpkgcmdarguments.h> + namespace vcpkg { struct TripletInstance; @@ -11,7 +13,7 @@ namespace vcpkg struct Triplet { public: - constexpr Triplet() noexcept : m_instance(&DEFAULT_INSTANCE) {} + constexpr Triplet() noexcept : m_instance(&DEFAULT_INSTANCE) { } static Triplet from_canonical_name(std::string&& triplet_as_string); @@ -23,7 +25,7 @@ namespace vcpkg static const Triplet X64_UWP; static const Triplet ARM_UWP; static const Triplet ARM64_UWP; - + static const Triplet ARM_ANDROID; static const Triplet ARM64_ANDROID; static const Triplet X86_ANDROID; @@ -41,12 +43,14 @@ namespace vcpkg private: static const TripletInstance DEFAULT_INSTANCE; - constexpr Triplet(const TripletInstance* ptr) : m_instance(ptr) {} + constexpr Triplet(const TripletInstance* ptr) : m_instance(ptr) { } const TripletInstance* m_instance; }; inline bool operator!=(Triplet left, Triplet right) { return !(left == right); } + + Triplet default_triplet(const VcpkgCmdArguments& args); } namespace std |
