diff options
| author | Robert Schumacher <roschuma@microsoft.com> | 2017-07-25 10:09:42 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-07-25 10:09:42 -0700 |
| commit | e2cdeddd594cdd9892ac1ea2914ba1785fe180e9 (patch) | |
| tree | d11e685ac59a6c55947c0f8159a06c72ee55073c | |
| parent | b277b4dda3a2793fd59a6cca5de96f8bc65f1357 (diff) | |
| parent | 5d86005aa7a25f192d6a3023423e2977bcef7367 (diff) | |
| download | vcpkg-e2cdeddd594cdd9892ac1ea2914ba1785fe180e9.tar.gz vcpkg-e2cdeddd594cdd9892ac1ea2914ba1785fe180e9.zip | |
Merge pull request #1526 from Mixaill/cmake-39
[CMake] update to 3.9
| -rw-r--r-- | scripts/fetchDependency.ps1 | 12 | ||||
| -rw-r--r-- | toolsrc/src/VcpkgPaths.cpp | 4 |
2 files changed, 8 insertions, 8 deletions
diff --git a/scripts/fetchDependency.ps1 b/scripts/fetchDependency.ps1 index b6144d581..eecd7fe5a 100644 --- a/scripts/fetchDependency.ps1 +++ b/scripts/fetchDependency.ps1 @@ -151,12 +151,12 @@ function SelectProgram([Parameter(Mandatory=$true)][string]$Dependency) if($Dependency -eq "cmake") { - $requiredVersion = "3.8.0" - $downloadVersion = "3.8.0" - $url = "https://cmake.org/files/v3.8/cmake-3.8.0-win32-x86.zip" - $downloadPath = "$downloadsDir\cmake-3.8.0-win32-x86.zip" - $expectedDownloadedFileHash = "857fca00974ad6ac12fa042373d85ad1288770d4f09fbd99753c822df76b1c6c" - $executableFromDownload = "$downloadsDir\cmake-3.8.0-win32-x86\bin\cmake.exe" + $requiredVersion = "3.9.0" + $downloadVersion = "3.9.0" + $url = "https://cmake.org/files/v3.9/cmake-3.9.0-win32-x86.zip" + $downloadPath = "$downloadsDir\cmake-3.9.0-win32-x86.zip" + $expectedDownloadedFileHash = "9d593839f64b94718a1b75b8519b56ecb959e4d37d406bf2a087e2c1f7a6b89c" + $executableFromDownload = "$downloadsDir\cmake-3.9.0-win32-x86\bin\cmake.exe" $extractionType = $ExtractionType_ZIP $extractionFolder = $downloadsDir } 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; |