VcpkgCmdArguments.target_triplet -> ".triplet

This commit is contained in:
Alexander Karatarakis 2017-04-10 13:01:43 -07:00
parent 410aa5b43a
commit 84e1a9d3e5
3 changed files with 4 additions and 4 deletions

View File

@ -13,7 +13,7 @@ namespace vcpkg
static VcpkgCmdArguments create_from_arg_sequence(const std::string* arg_begin, const std::string* arg_end); static VcpkgCmdArguments create_from_arg_sequence(const std::string* arg_begin, const std::string* arg_end);
std::unique_ptr<std::string> vcpkg_root_dir; std::unique_ptr<std::string> vcpkg_root_dir;
std::unique_ptr<std::string> target_triplet; std::unique_ptr<std::string> triplet;
OptBoolT debug = OptBoolT::UNSPECIFIED; OptBoolT debug = OptBoolT::UNSPECIFIED;
OptBoolT sendmetrics = OptBoolT::UNSPECIFIED; OptBoolT sendmetrics = OptBoolT::UNSPECIFIED;
OptBoolT printmetrics = OptBoolT::UNSPECIFIED; OptBoolT printmetrics = OptBoolT::UNSPECIFIED;

View File

@ -88,7 +88,7 @@ namespace vcpkg
if (arg == "--triplet") if (arg == "--triplet")
{ {
++arg_begin; ++arg_begin;
parse_value(arg_begin, arg_end, "--triplet", args.target_triplet); parse_value(arg_begin, arg_end, "--triplet", args.triplet);
continue; continue;
} }
if (arg == "--debug") if (arg == "--debug")

View File

@ -70,9 +70,9 @@ static void inner(const VcpkgCmdArguments& args)
} }
Triplet default_triplet; Triplet default_triplet;
if (args.target_triplet != nullptr) if (args.triplet != nullptr)
{ {
default_triplet = Triplet::from_canonical_name(*args.target_triplet); default_triplet = Triplet::from_canonical_name(*args.triplet);
} }
else else
{ {