diff options
| author | Alexander Karatarakis <alex@karatarakis.com> | 2017-08-11 09:16:45 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-11 09:16:45 -0700 |
| commit | 5ee0531c2a3ac33528e4215f3362793bc464d379 (patch) | |
| tree | bb72f015258c4b949a54068f08062f394b759aed | |
| parent | f3f3c717093f2390f4dfb8813700ab49412a49c8 (diff) | |
| parent | f37acb1b21670839880e002ffc1bd4b0ba3559cb (diff) | |
| download | vcpkg-5ee0531c2a3ac33528e4215f3362793bc464d379.tar.gz vcpkg-5ee0531c2a3ac33528e4215f3362793bc464d379.zip | |
Merge pull request #1635 from atkawa7/patch-1
[cmake] update to 3.9.1
| -rw-r--r-- | README.md | 2 | ||||
| -rw-r--r-- | scripts/fetchDependency.ps1 | 12 | ||||
| -rw-r--r-- | toolsrc/src/VcpkgPaths.cpp | 4 |
3 files changed, 9 insertions, 9 deletions
@@ -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.0* +- *Optional: CMake 3.9.1* Clone this repository, then run ``` diff --git a/scripts/fetchDependency.ps1 b/scripts/fetchDependency.ps1 index 13799cc73..6941ed21e 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.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" + $requiredVersion = "3.9.1" + $downloadVersion = "3.9.1" + $url = "https://cmake.org/files/v3.9/cmake-3.9.1-win32-x86.zip" + $downloadPath = "$downloadsDir\cmake-3.9.1-win32-x86.zip" + $expectedDownloadedFileHash = "e0d9501bd34e3100e925dcb2e07f5f0ce8980bdbe5fce0ae950b21368d54c1a1" + $executableFromDownload = "$downloadsDir\cmake-3.9.1-win32-x86\bin\cmake.exe" $extractionType = $ExtractionType_ZIP $extractionFolder = $downloadsDir } diff --git a/toolsrc/src/VcpkgPaths.cpp b/toolsrc/src/VcpkgPaths.cpp index f3501e162..38b11584a 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, 9, 0}; + static constexpr std::array<int, 3> expected_version = {3, 9, 1}; static const std::wstring version_check_arguments = L"--version"; - const fs::path downloaded_copy = downloads_folder / "cmake-3.9.0-win32-x86" / "bin" / "cmake.exe"; + const fs::path downloaded_copy = downloads_folder / "cmake-3.9.1-win32-x86" / "bin" / "cmake.exe"; const std::vector<fs::path> from_path = find_from_PATH(L"cmake"); std::vector<fs::path> candidate_paths; |