diff options
| author | Alexander Karatarakis <alkarata@microsoft.com> | 2016-10-04 14:47:42 -0700 |
|---|---|---|
| committer | Alexander Karatarakis <alkarata@microsoft.com> | 2016-10-04 14:47:42 -0700 |
| commit | bf323e8cc6f3edd245e3f5661cab6c8b7f335da9 (patch) | |
| tree | d7907dd47b9c1a71bba891a66c0829bb1df5319d /toolsrc/src/commands_installation.cpp | |
| parent | 04539816b5e793afdcff991a28c298f199e709db (diff) | |
| download | vcpkg-bf323e8cc6f3edd245e3f5661cab6c8b7f335da9.tar.gz vcpkg-bf323e8cc6f3edd245e3f5661cab6c8b7f335da9.zip | |
[package_spec]User input gets lowercased; other input is checked
Diffstat (limited to 'toolsrc/src/commands_installation.cpp')
| -rw-r--r-- | toolsrc/src/commands_installation.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/toolsrc/src/commands_installation.cpp b/toolsrc/src/commands_installation.cpp index a94fb7e59..6fe6aa9a1 100644 --- a/toolsrc/src/commands_installation.cpp +++ b/toolsrc/src/commands_installation.cpp @@ -23,10 +23,11 @@ namespace vcpkg static void build_internal(const package_spec& spec, const vcpkg_paths& paths, const fs::path& port_dir) { const fs::path ports_cmake_script_path = paths.ports_cmake; + auto&& target_triplet = spec.target_triplet(); const std::wstring command = Strings::wformat(LR"("%%VS140COMNTOOLS%%..\..\VC\vcvarsall.bat" %s && cmake -DCMD=BUILD -DPORT=%s -DTARGET_TRIPLET=%s "-DCURRENT_PORT_DIR=%s/." -P "%s")", - Strings::utf8_to_utf16(spec.target_triplet().architecture()), + Strings::utf8_to_utf16(target_triplet.architecture()), Strings::utf8_to_utf16(spec.name()), - Strings::utf8_to_utf16(spec.target_triplet().canonical_name()), + Strings::utf8_to_utf16(target_triplet.canonical_name()), port_dir.generic_wstring(), ports_cmake_script_path.generic_wstring()); @@ -53,7 +54,7 @@ namespace vcpkg perform_all_checks(spec, paths); - create_binary_control_file(paths, port_dir, spec.target_triplet()); + create_binary_control_file(paths, port_dir, target_triplet); // const fs::path port_buildtrees_dir = paths.buildtrees / spec.name; // delete_directory(port_buildtrees_dir); |
