mirror/vcpkg
1
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2025-01-18 16:53:02 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Update cmake to 3.10.1

Browse Source
This commit is contained in:
Albert Ziegenhagel 2018-01-03 10:57:46 +01:00
parent e48a655df0
commit be5e529bb3
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 - Windows 10, 8.1, or 7
- Visual Studio 2017 or Visual Studio 2015 Update 3 - Visual Studio 2017 or Visual Studio 2015 Update 3
- Git - Git
- *Optional: CMake 3.10.0* - *Optional: CMake 3.10.1*
Clone this repository, then run Clone this repository, then run
``` ```

12
scripts/fetchDependency.ps1
View File

@ -20,12 +20,12 @@ function SelectProgram([Parameter(Mandatory=$true)][string]$Dependency)
if($Dependency -eq "cmake") if($Dependency -eq "cmake")
{ {
$requiredVersion = "3.10.0" $requiredVersion = "3.10.1"
$downloadVersion = "3.10.0" $downloadVersion = "3.10.1"
$url = "https://cmake.org/files/v3.10/cmake-3.10.0-win32-x86.zip" $url = "https://cmake.org/files/v3.10/cmake-3.10.1-win32-x86.zip"
$downloadPath = "$downloadsDir\cmake-3.10.0-win32-x86.zip" $downloadPath = "$downloadsDir\cmake-3.10.1-win32-x86.zip"
$expectedDownloadedFileHash = "dce666e897f95a88d3eed6cddd1faa3f44179d519b33ca6065b385bbc7072419" $expectedDownloadedFileHash = "6fe010cce1201d884cd7a9535db8a1f16d98b8965341251fde8f1c5069ee58c0"
$executableFromDownload = "$downloadsDir\cmake-3.10.0-win32-x86\bin\cmake.exe" $executableFromDownload = "$downloadsDir\cmake-3.10.1-win32-x86\bin\cmake.exe"
$extractionType = $ExtractionType_ZIP $extractionType = $ExtractionType_ZIP
} }
elseif($Dependency -eq "nuget") elseif($Dependency -eq "nuget")

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

@ -115,7 +115,7 @@ namespace vcpkg
static fs::path get_cmake_path(const fs::path& downloads_folder, const fs::path& scripts_folder) static fs::path get_cmake_path(const fs::path& downloads_folder, const fs::path& scripts_folder)
{ {
#if defined(_WIN32) #if defined(_WIN32)
static constexpr std::array<int, 3> EXPECTED_VERSION = {3, 10, 0}; static constexpr std::array<int, 3> EXPECTED_VERSION = {3, 10, 1};
#else #else
static constexpr std::array<int, 3> EXPECTED_VERSION = {3, 5, 1}; static constexpr std::array<int, 3> EXPECTED_VERSION = {3, 5, 1};
#endif #endif
@ -124,7 +124,7 @@ namespace vcpkg
const std::vector<fs::path> from_path = Files::find_from_PATH("cmake"); const std::vector<fs::path> from_path = Files::find_from_PATH("cmake");
std::vector<fs::path> candidate_paths; std::vector<fs::path> candidate_paths;
const fs::path downloaded_copy = downloads_folder / "cmake-3.10.0-win32-x86" / "bin" / "cmake.exe"; const fs::path downloaded_copy = downloads_folder / "cmake-3.10.1-win32-x86" / "bin" / "cmake.exe";
#if defined(_WIN32) #if defined(_WIN32)
candidate_paths.push_back(downloaded_copy); candidate_paths.push_back(downloaded_copy);
#endif #endif