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

Merge pull request #1635 from atkawa7/patch-1

Browse Source 
[cmake] update to 3.9.1
This commit is contained in:
Alexander Karatarakis 2017-08-11 09:16:45 -07:00 committed by GitHub
commit 5ee0531c2a
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

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

12
scripts/fetchDependency.ps1
View File

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

4
toolsrc/src/VcpkgPaths.cpp
View File

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