aboutsummaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorPhil Christensen <philc@microsoft.com>2019-07-02 15:12:47 -0700
committerGitHub <noreply@github.com>2019-07-02 15:12:47 -0700
commit24b1618b292541086cc97820df8619d6ede046f5 (patch)
treea254ccf5dd31e3d94746d29939fc45d0954b6e68 /scripts
parent2291b2f429081340816c8e98a2ecf483dd93e85f (diff)
downloadvcpkg-24b1618b292541086cc97820df8619d6ede046f5.tar.gz
vcpkg-24b1618b292541086cc97820df8619d6ede046f5.zip
revert ninja update (#7135)
Causing failures on Linux, revert until investigation is complete.
Diffstat (limited to 'scripts')
-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 fcfa6d0a1..737e332bc 100644
--- a/scripts/cmake/vcpkg_find_acquire_program.cmake
+++ b/scripts/cmake/vcpkg_find_acquire_program.cmake
@@ -123,7 +123,7 @@ function(vcpkg_find_acquire_program VAR)
set(HASH f73b04e2d9f29d4393fde572dcf3c3f0f6fa27e747e5df292294ab7536ae24c239bf917689d71eb10cc49f6b9a4ace26d7c122ee887d93cc935f268c404e9067)
elseif(VAR MATCHES "NINJA")
set(PROGNAME ninja)
- set(SUBDIR "ninja-1.9.0")
+ set(SUBDIR "ninja-1.8.2")
if(CMAKE_HOST_WIN32)
set(PATHS "${DOWNLOADS}/tools/ninja/${SUBDIR}")
elseif(CMAKE_HOST_SYSTEM_NAME STREQUAL "Darwin")
@@ -135,9 +135,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.9.0/ninja-win.zip")
- set(ARCHIVE "ninja-1.9.0-win.zip")
- set(HASH 1c050e602ec63d4dcf44d9ab3d2d02ac731b4b2977bc0b420a21e85604487f58ec8d3045941d4153ef06ab00c175ca7cf9d57b8e20a757528290e135639962ac)
+ set(URL "https://github.com/ninja-build/ninja/releases/download/v1.8.2/ninja-win.zip")
+ set(ARCHIVE "ninja-1.8.2-win.zip")
+ set(HASH 9b9ce248240665fcd6404b989f3b3c27ed9682838225e6dc9b67b551774f251e4ff8a207504f941e7c811e7a8be1945e7bcb94472a335ef15e23a0200a32e6d5)
elseif(VAR MATCHES "NUGET")
set(PROGNAME nuget)
set(PATHS "${DOWNLOADS}/tools/nuget")