aboutsummaryrefslogtreecommitdiff
path: root/toolsrc/src
diff options
context:
space:
mode:
authorMikhail Paulyshka <me@mixaill.tk>2017-11-26 14:18:35 +0300
committerAlexander Karatarakis <alex@karatarakis.com>2017-11-26 03:18:35 -0800
commite009618ba0850ef54e837e8fb76910245d99b456 (patch)
tree7c4629b3628ffa4ad43d5403e0063462b59bb02e /toolsrc/src
parent2af7fe8690a9b78f1eab1e532670ed133f82aff9 (diff)
downloadvcpkg-e009618ba0850ef54e837e8fb76910245d99b456.tar.gz
vcpkg-e009618ba0850ef54e837e8fb76910245d99b456.zip
[cmake] update to 3.10.0 (#2236)
Diffstat (limited to 'toolsrc/src')
-rw-r--r--toolsrc/src/vcpkg/vcpkgpaths.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/toolsrc/src/vcpkg/vcpkgpaths.cpp b/toolsrc/src/vcpkg/vcpkgpaths.cpp
index 016f26f6d..d5763921e 100644
--- a/toolsrc/src/vcpkg/vcpkgpaths.cpp
+++ b/toolsrc/src/vcpkg/vcpkgpaths.cpp
@@ -114,7 +114,7 @@ namespace vcpkg
static fs::path get_cmake_path(const fs::path& downloads_folder, const fs::path& scripts_folder)
{
#if defined(_WIN32)
- static constexpr std::array<int, 3> EXPECTED_VERSION = {3, 9, 5};
+ static constexpr std::array<int, 3> EXPECTED_VERSION = {3, 10, 0};
#else
static constexpr std::array<int, 3> EXPECTED_VERSION = {3, 5, 1};
#endif
@@ -123,7 +123,7 @@ namespace vcpkg
const std::vector<fs::path> from_path = Files::find_from_PATH("cmake");
std::vector<fs::path> candidate_paths;
- const fs::path downloaded_copy = downloads_folder / "cmake-3.9.5-win32-x86" / "bin" / "cmake.exe";
+ const fs::path downloaded_copy = downloads_folder / "cmake-3.10.0-win32-x86" / "bin" / "cmake.exe";
#if defined(_WIN32)
candidate_paths.push_back(downloaded_copy);
#endif