diff options
| author | Alexander Karatarakis <alkarata@microsoft.com> | 2017-02-16 18:02:16 -0800 |
|---|---|---|
| committer | Alexander Karatarakis <alkarata@microsoft.com> | 2017-02-16 18:02:16 -0800 |
| commit | 66cc4eed685f586cea4c36c1088632d6bf5feb9c (patch) | |
| tree | e119b2881696d1488431b9195dcf3f27362f892b /toolsrc/src/vcpkg_Environment.cpp | |
| parent | 1a6496b49403cb0df959f06fd075f9940089a1f6 (diff) | |
| download | vcpkg-66cc4eed685f586cea4c36c1088632d6bf5feb9c.tar.gz vcpkg-66cc4eed685f586cea4c36c1088632d6bf5feb9c.zip | |
CMake: Bump version to 3.8.0 to resolve VS2017 UWP build issues
Diffstat (limited to 'toolsrc/src/vcpkg_Environment.cpp')
| -rw-r--r-- | toolsrc/src/vcpkg_Environment.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/toolsrc/src/vcpkg_Environment.cpp b/toolsrc/src/vcpkg_Environment.cpp index cc3dba100..527d8de89 100644 --- a/toolsrc/src/vcpkg_Environment.cpp +++ b/toolsrc/src/vcpkg_Environment.cpp @@ -74,7 +74,7 @@ namespace vcpkg::Environment static const fs::path default_cmake_installation_dir = Environment::get_ProgramFiles_platform_bitness() / "CMake/bin"; static const fs::path default_cmake_installation_dir_32 = Environment::get_ProgramFiles_32_bit() / "CMake/bin"; - const fs::path downloaded_cmake = paths.downloads / "cmake-3.7.2-win32-x86" / "bin"; + const fs::path downloaded_cmake = paths.downloads / "cmake-3.8.0-rc1-win32-x86" / "bin"; const std::wstring path_buf = Strings::wformat(L"%s;%s;%s;%s", downloaded_cmake.native(), *System::get_environmental_variable(L"PATH"), @@ -82,7 +82,7 @@ namespace vcpkg::Environment default_cmake_installation_dir_32.native()); System::set_environmental_variable(L"PATH", path_buf.c_str()); - static constexpr std::array<int, 3> cmake_version = { 3,7,2 }; + static constexpr std::array<int, 3> cmake_version = { 3,8,0 }; static const std::wstring version_check_cmd = L"cmake --version 2>&1"; const std::wstring install_cmd = create_default_install_cmd(paths, L"cmake"); ensure_on_path(cmake_version, version_check_cmd, install_cmd); |