diff options
| author | Robert Schumacher <roschuma@microsoft.com> | 2020-04-16 12:23:19 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-16 12:23:19 -0700 |
| commit | 2070c3c0d8999556f873847cf4c080e1fd210086 (patch) | |
| tree | a9bb85c1c0cb332777691e50ea08c43fdbd6a784 /scripts | |
| parent | 065437a2994b3cde7df5324ef6000d64eddd9cf5 (diff) | |
| parent | 19ef8e31479d8f0d6a469c134080812944f2d7c1 (diff) | |
| download | vcpkg-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')
| -rw-r--r-- | scripts/cmake/vcpkg_find_acquire_program.cmake | 8 | ||||
| -rw-r--r-- | scripts/vcpkgTools.xml | 24 |
2 files changed, 16 insertions, 16 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") diff --git a/scripts/vcpkgTools.xml b/scripts/vcpkgTools.xml index 5ac380279..27eb3e7e0 100644 --- a/scripts/vcpkgTools.xml +++ b/scripts/vcpkgTools.xml @@ -87,25 +87,25 @@ <archiveName>aria2-1.33.1-win-32bit-build1.zip</archiveName> </tool> <tool name="ninja" os="windows"> - <version>1.8.2</version> + <version>1.10.0</version> <exeRelativePath>ninja.exe</exeRelativePath> - <url>https://github.com/ninja-build/ninja/releases/download/v1.8.2/ninja-win.zip</url> - <sha512>9b9ce248240665fcd6404b989f3b3c27ed9682838225e6dc9b67b551774f251e4ff8a207504f941e7c811e7a8be1945e7bcb94472a335ef15e23a0200a32e6d5</sha512> - <archiveName>ninja-win-1.8.2.zip</archiveName> + <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> </tool> <tool name="ninja" os="linux"> - <version>1.8.2</version> + <version>1.10.0</version> <exeRelativePath>ninja</exeRelativePath> - <url>https://github.com/ninja-build/ninja/releases/download/v1.8.2/ninja-linux.zip</url> - <sha512>38fcb68e745c1f15b4b50f20069ffe686b1ef5baf93b74958e132ea5d30d155cf6970d6dc1b095aafd421ebd8bcc63acf4f64e305c496266b5182f99b815cca5</sha512> - <archiveName>ninja-linux-1.8.2.zip</archiveName> + <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> </tool> <tool name="ninja" os="osx"> - <version>1.8.2</version> + <version>1.10.0</version> <exeRelativePath>ninja</exeRelativePath> - <url>https://github.com/ninja-build/ninja/releases/download/v1.8.2/ninja-mac.zip</url> - <sha512>acadfb286eb7d93676629701917fa0c3c39f36daa068c169e4a098c29f97380d1ea95abfd42b04798ff118fd9dc93fdb250fcda36086bac20bc5506354214fc3</sha512> - <archiveName>ninja-mac-1.8.2.zip</archiveName> + <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> </tool> <tool name="ninja" os="freebsd"> <version>1.8.2</version> |