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

[cmake] Update to 3.9.5 (was 3.9.4)

Browse Source
This commit is contained in:
Alexander Karatarakis 2017-11-03 18:25:54 -07:00
parent 34c25840a3
commit 3b90bc07ce
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.4*
- *Optional: CMake 3.9.5*
Clone this repository, then run
```

12
scripts/fetchDependency.ps1
View File

@ -160,12 +160,12 @@ function SelectProgram([Parameter(Mandatory=$true)][string]$Dependency)
if($Dependency -eq "cmake")
{
$requiredVersion = "3.9.4"
$downloadVersion = "3.9.4"
$url = "https://cmake.org/files/v3.9/cmake-3.9.4-win32-x86.zip"
$downloadPath = "$downloadsDir\cmake-3.9.4-win32-x86.zip"
$expectedDownloadedFileHash = "8214df1ff51f9a6a1f0e27f9bd18f402b1749c5b645fbf6e401bcb00047171cd"
$executableFromDownload = "$downloadsDir\cmake-3.9.4-win32-x86\bin\cmake.exe"
$requiredVersion = "3.9.5"
$downloadVersion = "3.9.5"
$url = "https://cmake.org/files/v3.9/cmake-3.9.5-win32-x86.zip"
$downloadPath = "$downloadsDir\cmake-3.9.5-win32-x86.zip"
$expectedDownloadedFileHash = "dd3e183254c12f7c338d3edfa642f1ac84a763b8b9a2feabb4ad5fccece5dff9"
$executableFromDownload = "$downloadsDir\cmake-3.9.5-win32-x86\bin\cmake.exe"
$extractionType = $ExtractionType_ZIP
$extractionFolder = $downloadsDir
}

4
toolsrc/src/vcpkg/vcpkgpaths.cpp
View File

@ -125,10 +125,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, 4};
static constexpr std::array<int, 3> EXPECTED_VERSION = {3, 9, 5};
static const std::string VERSION_CHECK_ARGUMENTS = "--version";
const fs::path downloaded_copy = downloads_folder / "cmake-3.9.4-win32-x86" / "bin" / "cmake.exe";
const fs::path downloaded_copy = downloads_folder / "cmake-3.9.5-win32-x86" / "bin" / "cmake.exe";
const std::vector<fs::path> from_path = Files::find_from_PATH("cmake");
std::vector<fs::path> candidate_paths;