[cmake] update to 3.10.0 (microsoft#2236)

brucedjones · Nov 26, 2017 · e009618 · e009618
1 parent 2af7fe8
commit e009618
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/README.md b/README.md
@@ -10,7 +10,7 @@ Prerequisites:
 - Windows 10, 8.1, or 7
 - Visual Studio 2017 or Visual Studio 2015 Update 3
 - Git
-- *Optional: CMake 3.9.5*
+- *Optional: CMake 3.10.0*
 
 Clone this repository, then run
 ```

diff --git a/scripts/fetchDependency.ps1 b/scripts/fetchDependency.ps1
@@ -20,12 +20,12 @@ function SelectProgram([Parameter(Mandatory=$true)][string]$Dependency)
 
     if($Dependency -eq "cmake")
     {
-        $requiredVersion = "3.9.5"
-        $downloadVersion = "3.9.5"
-        $url = "https://cmake.org/files/v3.9/cmake-3.9.5-win32-x86.zip"
-        $downloadPath = "$downloadsDir\cmake-3.9.5-win32-x86.zip"
-        $expectedDownloadedFileHash = "dd3e183254c12f7c338d3edfa642f1ac84a763b8b9a2feabb4ad5fccece5dff9"
-        $executableFromDownload = "$downloadsDir\cmake-3.9.5-win32-x86\bin\cmake.exe"
+        $requiredVersion = "3.10.0"
+        $downloadVersion = "3.10.0"
+        $url = "https://cmake.org/files/v3.10/cmake-3.10.0-win32-x86.zip"
+        $downloadPath = "$downloadsDir\cmake-3.10.0-win32-x86.zip"
+        $expectedDownloadedFileHash = "dce666e897f95a88d3eed6cddd1faa3f44179d519b33ca6065b385bbc7072419"
+        $executableFromDownload = "$downloadsDir\cmake-3.10.0-win32-x86\bin\cmake.exe"
         $extractionType = $ExtractionType_ZIP
     }
     elseif($Dependency -eq "nuget")

diff --git 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