diff options
| author | Robert Schumacher <roschuma@microsoft.com> | 2017-03-31 17:40:08 -0700 |
|---|---|---|
| committer | Alexander Karatarakis <alkarata@microsoft.com> | 2017-03-31 17:40:08 -0700 |
| commit | 4792821a1d5d5fec764241f3d97284ec1579ce3a (patch) | |
| tree | 6c1652b91be5e65754cb297bc99229f1ada3cee8 /toolsrc/src/commands_build.cpp | |
| parent | c84765601bbe49a6ec2e252ec681fe843212230f (diff) | |
| download | vcpkg-4792821a1d5d5fec764241f3d97284ec1579ce3a.tar.gz vcpkg-4792821a1d5d5fec764241f3d97284ec1579ce3a.zip | |
Move Environment:: functions into vcpkg_paths. Remove Environment.h/cpp
Diffstat (limited to 'toolsrc/src/commands_build.cpp')
| -rw-r--r-- | toolsrc/src/commands_build.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/toolsrc/src/commands_build.cpp b/toolsrc/src/commands_build.cpp index 390a117dd..301612831 100644 --- a/toolsrc/src/commands_build.cpp +++ b/toolsrc/src/commands_build.cpp @@ -7,7 +7,6 @@ #include "vcpkg_Dependencies.h" #include "vcpkg_System.h" #include "vcpkg_Chrono.h" -#include "vcpkg_Environment.h" #include "metrics.h" #include "vcpkg_Enums.h" #include "Paragraphs.h" @@ -43,7 +42,7 @@ namespace vcpkg::Commands::Build const fs::path& git_exe_path = paths.get_git_exe(); const fs::path ports_cmake_script_path = paths.ports_cmake; - const Environment::vcvarsall_and_platform_toolset vcvarsall_bat = Environment::get_vcvarsall_bat(paths); + const vcvarsall_and_platform_toolset vcvarsall_bat = paths.get_vcvarsall_bat(); const std::wstring cmd_set_environment = Strings::wformat(LR"("%s" %s >nul 2>&1)", vcvarsall_bat.path.native(), Strings::utf8_to_utf16(target_triplet.architecture())); const std::wstring cmd_launch_cmake = make_cmake_cmd(cmake_exe_path, ports_cmake_script_path, |