diff options
| author | Alexander Karatarakis <alkarata@microsoft.com> | 2017-04-10 13:01:43 -0700 |
|---|---|---|
| committer | Alexander Karatarakis <alkarata@microsoft.com> | 2017-04-10 13:01:43 -0700 |
| commit | 84e1a9d3e5b16f6e7e249dabc1bdf3bb27ab0da9 (patch) | |
| tree | 0ba1b7751aa53eb4943ced3a16f28d2011b4bfda | |
| parent | 410aa5b43a5fa995d8684590b119bbb04353a139 (diff) | |
| download | vcpkg-84e1a9d3e5b16f6e7e249dabc1bdf3bb27ab0da9.tar.gz vcpkg-84e1a9d3e5b16f6e7e249dabc1bdf3bb27ab0da9.zip | |
VcpkgCmdArguments.target_triplet -> ".triplet
| -rw-r--r-- | toolsrc/include/VcpkgCmdArguments.h | 2 | ||||
| -rw-r--r-- | toolsrc/src/VcpkgCmdArguments.cpp | 2 | ||||
| -rw-r--r-- | toolsrc/src/vcpkg.cpp | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/toolsrc/include/VcpkgCmdArguments.h b/toolsrc/include/VcpkgCmdArguments.h index 4a0809fff..3a915205e 100644 --- a/toolsrc/include/VcpkgCmdArguments.h +++ b/toolsrc/include/VcpkgCmdArguments.h @@ -13,7 +13,7 @@ namespace vcpkg 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> target_triplet; + std::unique_ptr<std::string> triplet; OptBoolT debug = OptBoolT::UNSPECIFIED; OptBoolT sendmetrics = OptBoolT::UNSPECIFIED; OptBoolT printmetrics = OptBoolT::UNSPECIFIED; diff --git a/toolsrc/src/VcpkgCmdArguments.cpp b/toolsrc/src/VcpkgCmdArguments.cpp index 99ca26877..b5f608840 100644 --- a/toolsrc/src/VcpkgCmdArguments.cpp +++ b/toolsrc/src/VcpkgCmdArguments.cpp @@ -88,7 +88,7 @@ namespace vcpkg if (arg == "--triplet") { ++arg_begin; - parse_value(arg_begin, arg_end, "--triplet", args.target_triplet); + parse_value(arg_begin, arg_end, "--triplet", args.triplet); continue; } if (arg == "--debug") diff --git a/toolsrc/src/vcpkg.cpp b/toolsrc/src/vcpkg.cpp index ffe325f6e..74e11c3d4 100644 --- a/toolsrc/src/vcpkg.cpp +++ b/toolsrc/src/vcpkg.cpp @@ -70,9 +70,9 @@ static void inner(const VcpkgCmdArguments& args) } 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 { |