diff options
| author | Alexander Karatarakis <alex@karatarakis.com> | 2016-09-20 15:36:22 -0700 |
|---|---|---|
| committer | Robert Schumacher <roschuma@microsoft.com> | 2016-09-20 15:36:22 -0700 |
| commit | 58bcdde2f7718827dc3b5c1731f6a25bd0f972ee (patch) | |
| tree | 5fd24db4dd6bd7e5b8c0395d04048f9415222b2f /toolsrc/src/commands_installation.cpp | |
| parent | 744144381187bfa5c4aaf83878f0147c3ce99a8e (diff) | |
| download | vcpkg-58bcdde2f7718827dc3b5c1731f6a25bd0f972ee.tar.gz vcpkg-58bcdde2f7718827dc3b5c1731f6a25bd0f972ee.zip | |
[vcpkg] Improve consistency in use of %VS140COMNTOOLS%
Diffstat (limited to 'toolsrc/src/commands_installation.cpp')
| -rw-r--r-- | toolsrc/src/commands_installation.cpp | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/toolsrc/src/commands_installation.cpp b/toolsrc/src/commands_installation.cpp index f6a774b8d..b70ab0249 100644 --- a/toolsrc/src/commands_installation.cpp +++ b/toolsrc/src/commands_installation.cpp @@ -23,10 +23,7 @@ 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; - const std::wstring vs140comntools = System::wdupenv_str(L"VS140COMNTOOLS"); - - const std::wstring command = Strings::format(LR"("%s..\..\VC\vcvarsall.bat" %s && cmake -DCMD=BUILD -DPORT=%s -DTARGET_TRIPLET=%s "-DCURRENT_PORT_DIR=%s/." -P "%s")", - vs140comntools, + const std::wstring command = Strings::format(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(spec.name), Strings::utf8_to_utf16(spec.target_triplet.value), |