mirror/vcpkg
1
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2024-11-29 06:59:00 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Update cmake version to 3.8.0 (was 3.8.0rc1)

Browse Source
This commit is contained in:
Alexander Karatarakis 2017-04-21 18:41:01 -07:00
parent 817e2f47af
commit 5fbc9c4563
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
scripts/fetchDependency.ps1
View File

@ -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
}

2
toolsrc/src/VcpkgPaths.cpp
View File

@ -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;