diff options
| author | Alexander Karatarakis <alkarata@microsoft.com> | 2017-10-17 12:41:34 -0700 |
|---|---|---|
| committer | Alexander Karatarakis <alkarata@microsoft.com> | 2017-10-17 12:43:08 -0700 |
| commit | 87296823ac9cc939c233caf7c02585b5fe6d3df7 (patch) | |
| tree | faa7859f03d95cb19700e1c552e5a46512442a72 | |
| parent | a536a4630261684370cd1b43b88e8121fe50f9ad (diff) | |
| download | vcpkg-87296823ac9cc939c233caf7c02585b5fe6d3df7.tar.gz vcpkg-87296823ac9cc939c233caf7c02585b5fe6d3df7.zip | |
[cmake] Update to 3.9.4 (was 3.9.3)
| -rw-r--r-- | README.md | 2 | ||||
| -rw-r--r-- | scripts/fetchDependency.ps1 | 12 | ||||
| -rw-r--r-- | toolsrc/src/vcpkg/vcpkgpaths.cpp | 4 |
3 files changed, 9 insertions, 9 deletions
@@ -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 ``` diff --git a/scripts/fetchDependency.ps1 b/scripts/fetchDependency.ps1 index 773ebeac4..b43fd0cb5 100644 --- a/scripts/fetchDependency.ps1 +++ b/scripts/fetchDependency.ps1 @@ -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 } diff --git a/toolsrc/src/vcpkg/vcpkgpaths.cpp b/toolsrc/src/vcpkg/vcpkgpaths.cpp index 90f9cb00b..486fff40e 100644 --- a/toolsrc/src/vcpkg/vcpkgpaths.cpp +++ b/toolsrc/src/vcpkg/vcpkgpaths.cpp @@ -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; |