From 33a53a8ad0def775cadb20f37047cb6ab3885348 Mon Sep 17 00:00:00 2001
From: Voskrese <10104740+Voskrese@users.noreply.github.com>
Date: Sun, 12 Apr 2020 12:47:40 +0800
Subject: [PATCH 1/2] ninja update 1.10
---
scripts/cmake/vcpkg_find_acquire_program.cmake | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/scripts/cmake/vcpkg_find_acquire_program.cmake b/scripts/cmake/vcpkg_find_acquire_program.cmake
index c7fbe0f847..6086525d1a 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")
From 19ef8e31479d8f0d6a469c134080812944f2d7c1 Mon Sep 17 00:00:00 2001
From: Voskrese <10104740+Voskrese@users.noreply.github.com>
Date: Sun, 12 Apr 2020 12:58:31 +0800
Subject: [PATCH 2/2] ninja update 1.10
---
scripts/vcpkgTools.xml | 24 ++++++++++++------------
1 file changed, 12 insertions(+), 12 deletions(-)
diff --git a/scripts/vcpkgTools.xml b/scripts/vcpkgTools.xml
index 5ac380279a..27eb3e7e06 100644
--- a/scripts/vcpkgTools.xml
+++ b/scripts/vcpkgTools.xml
@@ -87,25 +87,25 @@
aria2-1.33.1-win-32bit-build1.zip
- 1.8.2
+ 1.10.0
ninja.exe
- https://github.com/ninja-build/ninja/releases/download/v1.8.2/ninja-win.zip
- 9b9ce248240665fcd6404b989f3b3c27ed9682838225e6dc9b67b551774f251e4ff8a207504f941e7c811e7a8be1945e7bcb94472a335ef15e23a0200a32e6d5
- ninja-win-1.8.2.zip
+ https://github.com/ninja-build/ninja/releases/download/v1.10.0/ninja-win.zip
+ a196e243c53daa1df9d287af658d6d38d6b830b614f2d5704e8c88ffc61f179a533ae71cdb6d0d383d1559d65dacccbaaab270fb2a33aa211e5dba42ff046f97
+ ninja-win-1.10.0.zip
- 1.8.2
+ 1.10.0
ninja
- https://github.com/ninja-build/ninja/releases/download/v1.8.2/ninja-linux.zip
- 38fcb68e745c1f15b4b50f20069ffe686b1ef5baf93b74958e132ea5d30d155cf6970d6dc1b095aafd421ebd8bcc63acf4f64e305c496266b5182f99b815cca5
- ninja-linux-1.8.2.zip
+ https://github.com/ninja-build/ninja/releases/download/v1.10.0/ninja-linux.zip
+ ffb179ab8ea315167fcc99a8f13286e1363590185b18cf819cc73e09f2a7553790e9dc45fd1ccd0bd1d2dbf543aee3f6c0951cf9ce453a7168ffd2ac873cdd29
+ ninja-linux-1.10.0.zip
- 1.8.2
+ 1.10.0
ninja
- https://github.com/ninja-build/ninja/releases/download/v1.8.2/ninja-mac.zip
- acadfb286eb7d93676629701917fa0c3c39f36daa068c169e4a098c29f97380d1ea95abfd42b04798ff118fd9dc93fdb250fcda36086bac20bc5506354214fc3
- ninja-mac-1.8.2.zip
+ https://github.com/ninja-build/ninja/releases/download/v1.10.0/ninja-mac.zip
+ 619a1924067a0b30fc5f8887f868d3ee5481838d2f0f158d031f7614a2a10b95a73d4a56b658d5d560283ebf809e2e536b968c6c01ff0108075c3f393f5780ba
+ ninja-mac-1.10.0.zip
1.8.2