diff options
| author | Alexander Karatarakis <alex@karatarakis.com> | 2018-01-03 17:35:45 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-03 17:35:45 +0200 |
| commit | 6130cec4c61ff1d44d6db1171125db2faca20b8d (patch) | |
| tree | f05a4f15f6cc8915fd5a0daff0802a3bdb34a3c3 /toolsrc/src | |
| parent | cd45f25ea51fc94bdb200155a6929121551e4eb6 (diff) | |
| parent | 43aec468a14993044b9d6fd89d124c1371edba64 (diff) | |
| download | vcpkg-6130cec4c61ff1d44d6db1171125db2faca20b8d.tar.gz vcpkg-6130cec4c61ff1d44d6db1171125db2faca20b8d.zip | |
Merge pull request #2493 from albertziegenhagel/cmake-3.10.1
[cmake] update to 3.10.1
Diffstat (limited to 'toolsrc/src')
| -rw-r--r-- | toolsrc/src/vcpkg/vcpkgpaths.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/toolsrc/src/vcpkg/vcpkgpaths.cpp b/toolsrc/src/vcpkg/vcpkgpaths.cpp index e64a681e2..70d64de45 100644 --- a/toolsrc/src/vcpkg/vcpkgpaths.cpp +++ b/toolsrc/src/vcpkg/vcpkgpaths.cpp @@ -115,7 +115,7 @@ namespace vcpkg static fs::path get_cmake_path(const fs::path& downloads_folder, const fs::path& scripts_folder) { #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 static constexpr std::array<int, 3> EXPECTED_VERSION = {3, 5, 1}; #endif @@ -124,7 +124,7 @@ namespace vcpkg const std::vector<fs::path> from_path = Files::find_from_PATH("cmake"); 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) candidate_paths.push_back(downloaded_copy); #endif |