3party/vcpkg
0
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2024-12-27 10:21:07 +08:00
Code Issues Projects Releases Wiki Activity

[cmake] Update to 3.9.4 (was 3.9.3)

Browse Source
This commit is contained in:
Alexander Karatarakis 2017-10-17 12:41:34 -07:00
parent a536a46302
commit 87296823ac
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.1*
- *Optional: CMake 3.9.4*
Clone this repository, then run
```

12
scripts/fetchDependency.ps1
View File

@ -107,12 +107,12 @@ function SelectProgram([Parameter(Mandatory=$true)][string]$Dependency)
if($Dependency -eq "cmake")
{
$requiredVersion = "3.9.3"
$downloadVersion = "3.9.3"
$url = "https://cmake.org/files/v3.9/cmake-3.9.3-win32-x86.zip"
$downloadPath = "$downloadsDir\cmake-3.9.3-win32-x86.zip"
$expectedDownloadedFileHash = "47870e3d4c9a5aa019e71020cd85cc60b6f2d2569fb239eaec204cd991e512f1"
$executableFromDownload = "$downloadsDir\cmake-3.9.3-win32-x86\bin\cmake.exe"
$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"
$extractionType = $ExtractionType_ZIP
$extractionFolder = $downloadsDir
}

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

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