diff options
| author | Alexander Karatarakis <alkarata@microsoft.com> | 2017-01-23 16:16:19 -0800 |
|---|---|---|
| committer | Alexander Karatarakis <alkarata@microsoft.com> | 2017-01-23 16:16:19 -0800 |
| commit | 127fbe20263302ee2d877dcfedcf853d0415ce2f (patch) | |
| tree | 7c4c5e773ed7c15a4b41154214c7b39a9354cb4e /toolsrc/src/commands_build.cpp | |
| parent | e0e3f6ac21d074b0c043e9d6a2aff769930f07a7 (diff) | |
| download | vcpkg-127fbe20263302ee2d877dcfedcf853d0415ce2f.tar.gz vcpkg-127fbe20263302ee2d877dcfedcf853d0415ce2f.zip | |
[VS2017] Use Environment::get_vcvarsall_bat()
Diffstat (limited to 'toolsrc/src/commands_build.cpp')
| -rw-r--r-- | toolsrc/src/commands_build.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/toolsrc/src/commands_build.cpp b/toolsrc/src/commands_build.cpp index 72ebb264b..af1b3dc24 100644 --- a/toolsrc/src/commands_build.cpp +++ b/toolsrc/src/commands_build.cpp @@ -30,7 +30,9 @@ namespace vcpkg::Commands::Build const triplet& target_triplet = spec.target_triplet(); const fs::path ports_cmake_script_path = paths.ports_cmake; - 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")", + const fs::path vcvarsall_bat = Environment::get_vcvarsall_bat(paths); + const std::wstring command = Strings::wformat(LR"("%s" %s && cmake -DCMD=BUILD -DPORT=%s -DTARGET_TRIPLET=%s "-DCURRENT_PORT_DIR=%s/." -P "%s")", + vcvarsall_bat.native(), Strings::utf8_to_utf16(target_triplet.architecture()), Strings::utf8_to_utf16(source_paragraph.name), Strings::utf8_to_utf16(target_triplet.canonical_name()), |