diff options
| author | Alexander Karatarakis <alkarata@microsoft.com> | 2018-01-19 15:12:21 -0800 |
|---|---|---|
| committer | Alexander Karatarakis <alkarata@microsoft.com> | 2018-01-23 14:16:05 -0800 |
| commit | 3332326c655714fe2e1f740b5635a29c86581228 (patch) | |
| tree | b31e0964ad8fb2b53181e175e721feb6312d9606 /toolsrc/src | |
| parent | 2890ffa31c409e1384bdd562f6f5b9fc827a4c14 (diff) | |
| download | vcpkg-3332326c655714fe2e1f740b5635a29c86581228.tar.gz vcpkg-3332326c655714fe2e1f740b5635a29c86581228.zip | |
Update CMake to 3.10.2
Diffstat (limited to 'toolsrc/src')
| -rw-r--r-- | toolsrc/src/vcpkg/vcpkgpaths.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/toolsrc/src/vcpkg/vcpkgpaths.cpp b/toolsrc/src/vcpkg/vcpkgpaths.cpp index fa5fb128c..e6daedcd4 100644 --- a/toolsrc/src/vcpkg/vcpkgpaths.cpp +++ b/toolsrc/src/vcpkg/vcpkgpaths.cpp @@ -115,7 +115,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, 10, 1}; + static constexpr std::array<int, 3> EXPECTED_VERSION = {3, 10, 2}; #else static constexpr std::array<int, 3> EXPECTED_VERSION = {3, 5, 1}; #endif @@ -124,7 +124,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.10.1-win32-x86" / "bin" / "cmake.exe"; + const fs::path downloaded_copy = downloads_folder / "cmake-3.10.2-win32-x86" / "bin" / "cmake.exe"; #if defined(_WIN32) candidate_paths.push_back(downloaded_copy); #endif |