diff options
| author | Robert Schumacher <roschuma@microsoft.com> | 2016-09-30 14:59:58 -0700 |
|---|---|---|
| committer | Robert Schumacher <roschuma@microsoft.com> | 2016-09-30 14:59:58 -0700 |
| commit | 17786b865a9f004df391be69e8ad687d095f739b (patch) | |
| tree | 6c2047da6ac4a4a50775cc7ae7f92218cadd07d1 /toolsrc/src/main.cpp | |
| parent | 4ab32c520daa821250c6b4669dda7ce91b71d5e7 (diff) | |
| parent | 8ed88af8c9cf2ed2e6fd573b2cd5dc2b41b55625 (diff) | |
| download | vcpkg-17786b865a9f004df391be69e8ad687d095f739b.tar.gz vcpkg-17786b865a9f004df391be69e8ad687d095f739b.zip | |
Merge branch 'master' of https://github.com/microsoft/vcpkg
Diffstat (limited to 'toolsrc/src/main.cpp')
| -rw-r--r-- | toolsrc/src/main.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/toolsrc/src/main.cpp b/toolsrc/src/main.cpp index a2f6fa10f..a317330ff 100644 --- a/toolsrc/src/main.cpp +++ b/toolsrc/src/main.cpp @@ -70,14 +70,14 @@ static void inner(const vcpkg_cmd_arguments& args) } triplet default_target_triplet; - if(args.target_triplet != nullptr) + if (args.target_triplet != nullptr) { default_target_triplet = {*args.target_triplet}; } else { const auto vcpkg_default_triplet_env = System::wdupenv_str(L"VCPKG_DEFAULT_TRIPLET"); - if(!vcpkg_default_triplet_env.empty()) + if (!vcpkg_default_triplet_env.empty()) { default_target_triplet = {Strings::utf16_to_utf8(vcpkg_default_triplet_env)}; } @@ -87,7 +87,7 @@ static void inner(const vcpkg_cmd_arguments& args) } } - if(!default_target_triplet.validate(paths)) + if (!paths.is_valid_triplet(default_target_triplet)) { System::println(System::color::error, "Error: invalid triplet: %s", default_target_triplet.value); TrackProperty("error", "invalid triplet: " + default_target_triplet.value); |
