aboutsummaryrefslogtreecommitdiff
path: root/toolsrc/src/VcpkgPaths.cpp
diff options
context:
space:
mode:
authorAlexander Karatarakis <alex@karatarakis.com>2017-08-11 09:16:45 -0700
committerGitHub <noreply@github.com>2017-08-11 09:16:45 -0700
commit5ee0531c2a3ac33528e4215f3362793bc464d379 (patch)
treebb72f015258c4b949a54068f08062f394b759aed /toolsrc/src/VcpkgPaths.cpp
parentf3f3c717093f2390f4dfb8813700ab49412a49c8 (diff)
parentf37acb1b21670839880e002ffc1bd4b0ba3559cb (diff)
downloadvcpkg-5ee0531c2a3ac33528e4215f3362793bc464d379.tar.gz
vcpkg-5ee0531c2a3ac33528e4215f3362793bc464d379.zip
Merge pull request #1635 from atkawa7/patch-1
[cmake] update to 3.9.1
Diffstat (limited to 'toolsrc/src/VcpkgPaths.cpp')
-rw-r--r--toolsrc/src/VcpkgPaths.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/toolsrc/src/VcpkgPaths.cpp b/toolsrc/src/VcpkgPaths.cpp
index f3501e162..38b11584a 100644
--- a/toolsrc/src/VcpkgPaths.cpp
+++ b/toolsrc/src/VcpkgPaths.cpp
@@ -98,10 +98,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, 0};
+ static constexpr std::array<int, 3> expected_version = {3, 9, 1};
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");
std::vector<fs::path> candidate_paths;