aboutsummaryrefslogtreecommitdiff
path: root/toolsrc/src
diff options
context:
space:
mode:
authorRobert Schumacher <roschuma@microsoft.com>2017-07-25 10:09:42 -0700
committerGitHub <noreply@github.com>2017-07-25 10:09:42 -0700
commite2cdeddd594cdd9892ac1ea2914ba1785fe180e9 (patch)
treed11e685ac59a6c55947c0f8159a06c72ee55073c /toolsrc/src
parentb277b4dda3a2793fd59a6cca5de96f8bc65f1357 (diff)
parent5d86005aa7a25f192d6a3023423e2977bcef7367 (diff)
downloadvcpkg-e2cdeddd594cdd9892ac1ea2914ba1785fe180e9.tar.gz
vcpkg-e2cdeddd594cdd9892ac1ea2914ba1785fe180e9.zip
Merge pull request #1526 from Mixaill/cmake-39
[CMake] update to 3.9
Diffstat (limited to 'toolsrc/src')
-rw-r--r--toolsrc/src/VcpkgPaths.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/toolsrc/src/VcpkgPaths.cpp b/toolsrc/src/VcpkgPaths.cpp
index 9068e3903..bc1152b9d 100644
--- a/toolsrc/src/VcpkgPaths.cpp
+++ b/toolsrc/src/VcpkgPaths.cpp
@@ -98,10 +98,10 @@ namespace vcpkg
static fs::path get_cmake_path(const fs::path& downloads_folder, const fs::path scripts_folder)
{
- static constexpr std::array<int, 3> expected_version = {3, 8, 0};
+ static constexpr std::array<int, 3> expected_version = {3, 9, 0};
static const std::wstring version_check_arguments = L"--version";
- const fs::path downloaded_copy = downloads_folder / "cmake-3.8.0-win32-x86" / "bin" / "cmake.exe";
+ const fs::path downloaded_copy = downloads_folder / "cmake-3.9.0-win32-x86" / "bin" / "cmake.exe";
const std::vector<fs::path> from_path = find_from_PATH(L"cmake");
std::vector<fs::path> candidate_paths;