The-Homebrew-Cloud/cemu-vcpkg
2
0
Fork 0
mirror of https://github.com/cemu-project/vcpkg.git synced 2025-02-23 19:17:10 +01:00
Code Issues Packages Projects Releases Wiki Activity

Bump required version of CMake to 3.9.2

Browse Source
This commit is contained in:
Alexander Karatarakis 2017-09-15 16:47:07 -07:00
parent b08f2a02e7
commit 39a96fc2f4
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
scripts/fetchDependency.ps1
View File

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

4
toolsrc/src/VcpkgPaths.cpp
View File

@ -97,10 +97,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, 1};
static constexpr std::array<int, 3> EXPECTED_VERSION = {3, 9, 2};
static const std::wstring VERSION_CHECK_ARGUMENTS = L"--version";
const fs::path downloaded_copy = downloads_folder / "cmake-3.9.1-win32-x86" / "bin" / "cmake.exe";
const fs::path downloaded_copy = downloads_folder / "cmake-3.9.2-win32-x86" / "bin" / "cmake.exe";
const std::vector<fs::path> from_path = Files::find_from_PATH(L"cmake");
std::vector<fs::path> candidate_paths;