aboutsummaryrefslogtreecommitdiff
path: root/scripts/cmake
diff options
context:
space:
mode:
authorRobert Schumacher <roschuma@microsoft.com>2020-04-16 12:23:19 -0700
committerGitHub <noreply@github.com>2020-04-16 12:23:19 -0700
commit2070c3c0d8999556f873847cf4c080e1fd210086 (patch)
treea9bb85c1c0cb332777691e50ea08c43fdbd6a784 /scripts/cmake
parent065437a2994b3cde7df5324ef6000d64eddd9cf5 (diff)
parent19ef8e31479d8f0d6a469c134080812944f2d7c1 (diff)
downloadvcpkg-2070c3c0d8999556f873847cf4c080e1fd210086.tar.gz
vcpkg-2070c3c0d8999556f873847cf4c080e1fd210086.zip
[ninja] Merge pull request #10796 from Voskrese/ninja-update-1.10
[Ninja] Update to 1.10
Diffstat (limited to 'scripts/cmake')
-rw-r--r--scripts/cmake/vcpkg_find_acquire_program.cmake8
1 files changed, 4 insertions, 4 deletions
diff --git a/scripts/cmake/vcpkg_find_acquire_program.cmake b/scripts/cmake/vcpkg_find_acquire_program.cmake
index c7fbe0f84..6086525d1 100644
--- a/scripts/cmake/vcpkg_find_acquire_program.cmake
+++ b/scripts/cmake/vcpkg_find_acquire_program.cmake
@@ -174,7 +174,7 @@ function(vcpkg_find_acquire_program VAR)
set(HASH f73b04e2d9f29d4393fde572dcf3c3f0f6fa27e747e5df292294ab7536ae24c239bf917689d71eb10cc49f6b9a4ace26d7c122ee887d93cc935f268c404e9067)
elseif(VAR MATCHES "NINJA")
set(PROGNAME ninja)
- set(SUBDIR "ninja-1.8.2")
+ set(SUBDIR "ninja-1.10.0")
if(CMAKE_HOST_WIN32)
set(PATHS "${DOWNLOADS}/tools/ninja/${SUBDIR}")
elseif(CMAKE_HOST_SYSTEM_NAME STREQUAL "Darwin")
@@ -186,9 +186,9 @@ function(vcpkg_find_acquire_program VAR)
endif()
set(BREW_PACKAGE_NAME "ninja")
set(APT_PACKAGE_NAME "ninja-build")
- set(URL "https://github.com/ninja-build/ninja/releases/download/v1.8.2/ninja-win.zip")
- set(ARCHIVE "ninja-win-1.8.2.zip")
- set(HASH 9b9ce248240665fcd6404b989f3b3c27ed9682838225e6dc9b67b551774f251e4ff8a207504f941e7c811e7a8be1945e7bcb94472a335ef15e23a0200a32e6d5)
+ set(URL "https://github.com/ninja-build/ninja/releases/download/v1.10.0/ninja-win.zip")
+ set(ARCHIVE "ninja-win-1.10.0.zip")
+ set(HASH a196e243c53daa1df9d287af658d6d38d6b830b614f2d5704e8c88ffc61f179a533ae71cdb6d0d383d1559d65dacccbaaab270fb2a33aa211e5dba42ff046f97)
elseif(VAR MATCHES "NUGET")
set(PROGNAME nuget)
set(PATHS "${DOWNLOADS}/tools/nuget")