From 800f8b0e1dca9cfdb90a9e74c01060bc0440d2a6 Mon Sep 17 00:00:00 2001
From: Alexander Karatarakis <alkarata@microsoft.com>
Date: Fri, 30 Mar 2018 16:59:59 -0700
Subject: [PATCH] Specify ninja exe

---
 scripts/cmake/vcpkg_configure_cmake.cmake      | 1 +
 scripts/cmake/vcpkg_find_acquire_program.cmake | 8 ++++++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/scripts/cmake/vcpkg_configure_cmake.cmake b/scripts/cmake/vcpkg_configure_cmake.cmake
index 4ab02f71005..3a3a8851552 100644
--- a/scripts/cmake/vcpkg_configure_cmake.cmake
+++ b/scripts/cmake/vcpkg_configure_cmake.cmake
@@ -115,6 +115,7 @@ function(vcpkg_configure_cmake)
         vcpkg_find_acquire_program(NINJA)
         get_filename_component(NINJA_PATH ${NINJA} DIRECTORY)
         set(ENV{PATH} "$ENV{PATH};${NINJA_PATH}")
+        list(APPEND _csc_OPTIONS "-DCMAKE_MAKE_PROGRAM=${NINJA}")
     endif()
 
     file(REMOVE_RECURSE ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg)
diff --git a/scripts/cmake/vcpkg_find_acquire_program.cmake b/scripts/cmake/vcpkg_find_acquire_program.cmake
index 64d0c75999c..0352b18909f 100644
--- a/scripts/cmake/vcpkg_find_acquire_program.cmake
+++ b/scripts/cmake/vcpkg_find_acquire_program.cmake
@@ -105,14 +105,18 @@ function(vcpkg_find_acquire_program VAR)
     set(HASH 830cd94ed6518fbe4604a0f5a3322671b4674b87d25a71349c745500d38e85c0fac4f6995242fc5521eb048e3966bb5ec2a96a06b041343ed8da9bba78124f34)
   elseif(VAR MATCHES "7Z")
     set(PROGNAME 7z)
-    set(PATHS "${PROGRAM_FILES_PLATFORM_BITNESS}/7-Zip" "${PROGRAM_FILES_32_BIT}/7-Zip" ${DOWNLOADS}/tools/7z/Files/7-Zip)
+    set(PATHS "${PROGRAM_FILES_PLATFORM_BITNESS}/7-Zip" "${PROGRAM_FILES_32_BIT}/7-Zip" "${DOWNLOADS}/tools/7z/Files/7-Zip")
     set(URL "http://7-zip.org/a/7z1604.msi")
     set(ARCHIVE "7z1604.msi")
     set(HASH 556f95f7566fe23704d136239e4cf5e2a26f939ab43b44145c91b70d031a088d553e5c21301f1242a2295dcde3143b356211f0108c68e65eef8572407618326d)
   elseif(VAR MATCHES "NINJA")
     set(PROGNAME ninja)
     set(SUBDIR "ninja-1.8.2")
-    set(PATHS ${DOWNLOADS}/tools/ninja/${SUBDIR})
+    if(CMAKE_HOST_WIN32)
+      set(PATHS "${DOWNLOADS}/tools/ninja/${SUBDIR}")
+    else()
+      set(PATHS "${DOWNLOADS}/tools/${SUBDIR}")
+    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")