diff options
| author | Alexander Karatarakis <alkarata@microsoft.com> | 2017-04-21 18:41:01 -0700 |
|---|---|---|
| committer | Alexander Karatarakis <alkarata@microsoft.com> | 2017-04-21 18:41:01 -0700 |
| commit | 5fbc9c4563dafd288a6177a611afcb37aa292685 (patch) | |
| tree | 176de894bc031eddb0e23f51439392c353171d2a | |
| parent | 817e2f47af792e4aee93d68356ba50d3549f8a51 (diff) | |
| download | vcpkg-5fbc9c4563dafd288a6177a611afcb37aa292685.tar.gz vcpkg-5fbc9c4563dafd288a6177a611afcb37aa292685.zip | |
Update cmake version to 3.8.0 (was 3.8.0rc1)
| -rw-r--r-- | scripts/fetchDependency.ps1 | 8 | ||||
| -rw-r--r-- | toolsrc/src/VcpkgPaths.cpp | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/scripts/fetchDependency.ps1 b/scripts/fetchDependency.ps1 index 6bbb9277c..9bf42505f 100644 --- a/scripts/fetchDependency.ps1 +++ b/scripts/fetchDependency.ps1 @@ -149,10 +149,10 @@ function SelectProgram([Parameter(Mandatory=$true)][string]$Dependency) { $requiredVersion = "3.8.0" $downloadVersion = "3.8.0" - $url = "https://cmake.org/files/v3.8/cmake-3.8.0-rc1-win32-x86.zip" - $downloadPath = "$downloadsDir\cmake-3.8.0-rc1-win32-x86.zip" - $expectedDownloadedFileHash = "ccdbd92fbfb548aa35a545e4e45ff19fd6d13c88c90370acdf940c3cf464e9c9" - $executableFromDownload = "$downloadsDir\cmake-3.8.0-rc1-win32-x86\bin\cmake.exe" + $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" $extractionType = $ExtractionType_ZIP $extractionFolder = $downloadsDir } diff --git a/toolsrc/src/VcpkgPaths.cpp b/toolsrc/src/VcpkgPaths.cpp index 93b26287f..5a1217d0a 100644 --- a/toolsrc/src/VcpkgPaths.cpp +++ b/toolsrc/src/VcpkgPaths.cpp @@ -90,7 +90,7 @@ namespace vcpkg static constexpr std::array<int, 3> expected_version = { 3,8,0 }; static const std::wstring version_check_arguments = L"--version"; - const fs::path downloaded_copy = downloads_folder / "cmake-3.8.0-rc1-win32-x86" / "bin" / "cmake.exe"; + const fs::path downloaded_copy = downloads_folder / "cmake-3.8.0-win32-x86" / "bin" / "cmake.exe"; const std::vector<fs::path> from_path = find_from_PATH(L"cmake"); std::vector<fs::path> candidate_paths; |