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

[Ninja] update to 1.10.1 (#13562)

Browse Source 
* [Ninja] update to 1.10.1

* [Ninja] update to 1.10.1 (find_acquire_program)

Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
This commit is contained in:
Farwaykorse 2020-09-24 21:15:54 +02:00 committed by GitHub
parent 9e70773e0e
commit 802c9c6aec
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
scripts/cmake/vcpkg_find_acquire_program.cmake
View File

@ -211,19 +211,19 @@ function(vcpkg_find_acquire_program VAR)
set(HASH f73b04e2d9f29d4393fde572dcf3c3f0f6fa27e747e5df292294ab7536ae24c239bf917689d71eb10cc49f6b9a4ace26d7c122ee887d93cc935f268c404e9067)
elseif(VAR MATCHES "NINJA")
set(PROGNAME ninja)
set(NINJA_VERSION 1.10.0)
set(NINJA_VERSION 1.10.1)
set(_vfa_SUPPORTED ON)
if(CMAKE_HOST_WIN32)
set(ARCHIVE "ninja-win-${NINJA_VERSION}.zip")
set(SUBDIR "${NINJA_VERSION}-windows")
set(URL "https://github.com/ninja-build/ninja/releases/download/v${NINJA_VERSION}/ninja-win.zip")
set(HASH a196e243c53daa1df9d287af658d6d38d6b830b614f2d5704e8c88ffc61f179a533ae71cdb6d0d383d1559d65dacccbaaab270fb2a33aa211e5dba42ff046f97)
set(HASH 0120054f0fea6eea4035866201f69fba1c039f681f680cfcbbefcaee97419815d092a6e2f3823ea6c3928ad296395f36029e337127ee977270000b35df5f9c40)
elseif(CMAKE_HOST_SYSTEM_NAME STREQUAL "Darwin")
set(ARCHIVE "ninja-mac-${NINJA_VERSION}.zip")
set(URL "https://github.com/ninja-build/ninja/releases/download/v${NINJA_VERSION}/ninja-mac.zip")
set(SUBDIR "${NINJA_VERSION}-osx")
set(PATHS "${DOWNLOADS}/tools/ninja-${NINJA_VERSION}-osx")
set(HASH 619a1924067a0b30fc5f8887f868d3ee5481838d2f0f158d031f7614a2a10b95a73d4a56b658d5d560283ebf809e2e536b968c6c01ff0108075c3f393f5780ba)
set(HASH 99f5ccca2461a4d340f4528a8eef6d81180757da78313f1f9412ed13a7bbaf6df537a342536fd053db00524bcb734d205af5f6fde419a1eb2e6f77ee8b7860fe)
elseif(CMAKE_HOST_SYSTEM_NAME STREQUAL "FreeBSD")
set(PATHS "${DOWNLOADS}/tools/${SUBDIR}-freebsd")
set(_vfa_SUPPORTED OFF)
@ -232,7 +232,7 @@ function(vcpkg_find_acquire_program VAR)
set(URL "https://github.com/ninja-build/ninja/releases/download/v${NINJA_VERSION}/ninja-linux.zip")
set(SUBDIR "${NINJA_VERSION}-linux")
set(PATHS "${DOWNLOADS}/tools/ninja-${NINJA_VERSION}-linux")
set(HASH ffb179ab8ea315167fcc99a8f13286e1363590185b18cf819cc73e09f2a7553790e9dc45fd1ccd0bd1d2dbf543aee3f6c0951cf9ce453a7168ffd2ac873cdd29)
set(HASH 9820c76fde6fac398743766e7ea0fe8a7d6e4191a77512a2d2f51c2ddcc947fcd91ac08522742281a285418c114e760b0158a968305f8dc854bb9693883b7f1e)
endif()
set(VERSION_CMD --version)
elseif(VAR MATCHES "NUGET")

24
scripts/vcpkgTools.xml
View File

@ -106,25 +106,25 @@
<archiveName>aria2-1.33.1-win-32bit-build1.zip</archiveName>
</tool>
<tool name="ninja" os="windows">
<version>1.10.0</version>
<version>1.10.1</version>
<exeRelativePath>ninja.exe</exeRelativePath>
<url>https://github.com/ninja-build/ninja/releases/download/v1.10.0/ninja-win.zip</url>
<sha512>a196e243c53daa1df9d287af658d6d38d6b830b614f2d5704e8c88ffc61f179a533ae71cdb6d0d383d1559d65dacccbaaab270fb2a33aa211e5dba42ff046f97</sha512>
<archiveName>ninja-win-1.10.0.zip</archiveName>
<url>https://github.com/ninja-build/ninja/releases/download/v1.10.1/ninja-win.zip</url>
<sha512>0120054f0fea6eea4035866201f69fba1c039f681f680cfcbbefcaee97419815d092a6e2f3823ea6c3928ad296395f36029e337127ee977270000b35df5f9c40</sha512>
<archiveName>ninja-win-1.10.1.zip</archiveName>
</tool>
<tool name="ninja" os="linux">
<version>1.10.0</version>
<version>1.10.1</version>
<exeRelativePath>ninja</exeRelativePath>
<url>https://github.com/ninja-build/ninja/releases/download/v1.10.0/ninja-linux.zip</url>
<sha512>ffb179ab8ea315167fcc99a8f13286e1363590185b18cf819cc73e09f2a7553790e9dc45fd1ccd0bd1d2dbf543aee3f6c0951cf9ce453a7168ffd2ac873cdd29</sha512>
<archiveName>ninja-linux-1.10.0.zip</archiveName>
<url>https://github.com/ninja-build/ninja/releases/download/v1.10.1/ninja-linux.zip</url>
<sha512>9820c76fde6fac398743766e7ea0fe8a7d6e4191a77512a2d2f51c2ddcc947fcd91ac08522742281a285418c114e760b0158a968305f8dc854bb9693883b7f1e</sha512>
<archiveName>ninja-linux-1.10.1.zip</archiveName>
</tool>
<tool name="ninja" os="osx">
<version>1.10.0</version>
<version>1.10.1</version>
<exeRelativePath>ninja</exeRelativePath>
<url>https://github.com/ninja-build/ninja/releases/download/v1.10.0/ninja-mac.zip</url>
<sha512>619a1924067a0b30fc5f8887f868d3ee5481838d2f0f158d031f7614a2a10b95a73d4a56b658d5d560283ebf809e2e536b968c6c01ff0108075c3f393f5780ba</sha512>
<archiveName>ninja-mac-1.10.0.zip</archiveName>
<url>https://github.com/ninja-build/ninja/releases/download/v1.10.1/ninja-mac.zip</url>
<sha512>99f5ccca2461a4d340f4528a8eef6d81180757da78313f1f9412ed13a7bbaf6df537a342536fd053db00524bcb734d205af5f6fde419a1eb2e6f77ee8b7860fe</sha512>
<archiveName>ninja-mac-1.10.1.zip</archiveName>
</tool>
<tool name="ninja" os="freebsd">
<version>1.8.2</version>