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

[cmake] Fix cmake path

Browse Source
This commit is contained in:
atkawa7 2017-08-11 09:10:37 -07:00 committed by GitHub
parent 8b09cb2efe
commit 6e5ec2ff08
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
toolsrc/src/VcpkgPaths.cpp
View File

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