Merge from master

1 files changed, 28 insertions, 32 deletions

diff --git a/scripts/cmake/vcpkg_find_acquire_program.cmake b/scripts/cmake/vcpkg_find_acquire_program.cmake
index fef62da53..b81675c13 100644
--- a/scripts/cmake/vcpkg_find_acquire_program.cmake
+++ b/scripts/cmake/vcpkg_find_acquire_program.cmake
@@ -34,7 +34,8 @@
 ## * [openssl](https://github.com/Microsoft/vcpkg/blob/master/ports/openssl/portfile.cmake)
 ## * [qt5](https://github.com/Microsoft/vcpkg/blob/master/ports/qt5/portfile.cmake)
 function(vcpkg_find_acquire_program VAR)
-  if(${VAR} AND NOT ${VAR} MATCHES "-NOTFOUND")
+  set(EXPANDED_VAR ${${VAR}})
+  if(EXPANDED_VAR)
     return()
   endif()
 
@@ -66,31 +67,19 @@ function(vcpkg_find_acquire_program VAR)
     set(HASH 850b26be5bbbdaeaf45ac39dd27f69f1a85e600c35afbd16b9f621396b3c7a19863ea3ff316b025b578fce0a8280eef2203306a2b3e46ee1389abb65313fb720)
   elseif(VAR MATCHES "PYTHON3")
     set(PROGNAME python)
-    set(PATHS ${DOWNLOADS}/tools/python)
-    set(URL "https://www.python.org/ftp/python/3.5.3/python-3.5.3-embed-win32.zip")
-    set(ARCHIVE "python-3.5.3-embed-win32.zip")
-    set(HASH c8cfdc09d052dc27e4380e8e4bf0d32a4c0def7e03896c1fa6cabc26dde78bb74dbb04e3673cc36e3e307d65a1ef284d69174f0cc80008c83bc6178f192ac5cf)
+    set(SUBDIR "python3")
+    set(PATHS ${DOWNLOADS}/tools/python/${SUBDIR})
+    set(URL "https://www.python.org/ftp/python/3.5.4/python-3.5.4-embed-win32.zip")
+    set(ARCHIVE "python-3.5.4-embed-win32.zip")
+    set(HASH b5240fdc95088c2d7f65d2dd598650f8dd106b49589d94156bd4a078b108c6cabbe7a38ef73e2b2cf00e8312a93d2e587eac2c54ce85540d3c7a26cc60013156)
   elseif(VAR MATCHES "PYTHON2")
-    find_program(PYTHON2 NAMES python2 python PATHS C:/python27 c:/Python27amd64 ENV PYTHON)
-    if(NOT PYTHON2 MATCHES "NOTFOUND")
-        execute_process(
-            COMMAND ${PYTHON2} --version
-            OUTPUT_VARIABLE PYTHON_VER_CHECK_OUT
-            ERROR_VARIABLE PYTHON_VER_CHECK_ERR
-        )
-        set(PYTHON_VER_CHECK "${PYTHON_VER_CHECK_OUT}${PYTHON_VER_CHECK_ERR}")
-        debug_message("PYTHON_VER_CHECK=${PYTHON_VER_CHECK}")
-        if(NOT PYTHON_VER_CHECK MATCHES "Python 2.7")
-            set(PYTHON2 PYTHON2-NOTFOUND)
-            find_program(PYTHON2 NAMES python2 python PATHS C:/python27 ENV PYTHON NO_SYSTEM_ENVIRONMENT_PATH)
-        endif()
-    endif()
-    if(PYTHON2 MATCHES "NOTFOUND")
-        message(FATAL_ERROR "Python 2.7 was not found in the path or by searching inside C:\\Python27.\n"
-        "There is no portable redistributable for Python 2.7, so you will need to install the MSI located at:\n"
-        "    https://www.python.org/ftp/python/2.7.13/python-2.7.13.msi\n"
-        )
-    endif()
+    set(PROGNAME python)
+    set(SUBDIR "python2")
+    set(PATHS ${DOWNLOADS}/tools/python/${SUBDIR})
+    file(TO_NATIVE_PATH "${PATHS}" DESTINATION_NATIVE_PATH)
+    set(URL "https://www.python.org/ftp/python/2.7.14/python-2.7.14.msi")
+    set(ARCHIVE "python2.msi")
+    set(HASH 8c3ad6e527742d99ba96dcfd1098861b14e7207b80d51a54e9b410ab2f36e44e05561ea1527d8e92b3e10808311536260bd9e82db0da3b513fb1be18e108510e)
   elseif(VAR MATCHES "RUBY")
     set(PROGNAME "ruby")
     set(PATHS ${DOWNLOADS}/tools/ruby/rubyinstaller-2.4.1-1-x86/bin)
@@ -112,11 +101,11 @@ function(vcpkg_find_acquire_program VAR)
     set(HASH 556f95f7566fe23704d136239e4cf5e2a26f939ab43b44145c91b70d031a088d553e5c21301f1242a2295dcde3143b356211f0108c68e65eef8572407618326d)
   elseif(VAR MATCHES "NINJA")
     set(PROGNAME ninja)
-    set(SUBDIR "ninja-1.7.2")
+    set(SUBDIR "ninja-1.8.2")
     set(PATHS ${DOWNLOADS}/tools/ninja/${SUBDIR})
-    set(URL "https://github.com/ninja-build/ninja/releases/download/v1.7.2/ninja-win.zip")
-    set(ARCHIVE "ninja-win.zip")
-    set(HASH cccab9281b274c564f9ad77a2115be1f19be67d7b2ee14a55d1db1b27f3b68db8e76076e4f804b61eb8e573e26a8ecc9985675a8dcf03fd7a77b7f57234f1393)
+    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 "MESON")
     set(PROGNAME meson)
     set(REQUIRED_INTERPRETER PYTHON3)
@@ -152,6 +141,13 @@ function(vcpkg_find_acquire_program VAR)
     set(URL "https://raw.githubusercontent.com/FFmpeg/gas-preprocessor/36bacb4cba27003c572e5bf7a9c4dfe3c9a8d40d/gas-preprocessor.pl")
     set(ARCHIVE "gas-preprocessor.pl")
     set(HASH a25caadccd1457a0fd2abb5a0da9aca1713b2c351d76daf87a4141e52021f51aa09e95a62942c6f0764f79cc1fa65bf71584955b09e62ee7da067b5c82baf6b3)
+  elseif(VAR MATCHES "DARK")
+    set(PROGNAME dark)
+    set(SUBDIR "wix311-binaries")
+    set(PATHS ${DOWNLOADS}/tools/dark/${SUBDIR})
+    set(URL "https://github.com/wixtoolset/wix3/releases/download/wix311rtm/wix311-binaries.zip")
+    set(ARCHIVE "wix311-binaries.zip")
+    set(HASH 74f0fa29b5991ca655e34a9d1000d47d4272e071113fada86727ee943d913177ae96dc3d435eaf494d2158f37560cd4c2c5274176946ebdb17bf2354ced1c516)
   else()
     message(FATAL "unknown tool ${VAR} -- unable to acquire.")
   endif()
@@ -167,7 +163,7 @@ function(vcpkg_find_acquire_program VAR)
   endmacro()
 
   do_find()
-  if(${VAR} MATCHES "-NOTFOUND")
+  if("${${VAR}}" MATCHES "-NOTFOUND")
     file(DOWNLOAD ${URL} ${DOWNLOADS}/${ARCHIVE}
       EXPECTED_HASH SHA512=${HASH}
       SHOW_PROGRESS
@@ -178,7 +174,7 @@ function(vcpkg_find_acquire_program VAR)
     else()
       get_filename_component(ARCHIVE_EXTENSION ${ARCHIVE} EXT)
       string(TOLOWER "${ARCHIVE_EXTENSION}" ARCHIVE_EXTENSION)
-      if(${ARCHIVE_EXTENSION} STREQUAL ".msi")
+      if(ARCHIVE_EXTENSION STREQUAL ".msi")
         file(TO_NATIVE_PATH "${DOWNLOADS}/${ARCHIVE}" ARCHIVE_NATIVE_PATH)
         file(TO_NATIVE_PATH "${DOWNLOADS}/tools/${PROGNAME}/${SUBDIR}" DESTINATION_NATIVE_PATH)
         execute_process(
@@ -196,5 +192,5 @@ function(vcpkg_find_acquire_program VAR)
     do_find()
   endif()
 
-  set(${VAR} ${${VAR}} PARENT_SCOPE)
+  set(${VAR} "${${VAR}}" PARENT_SCOPE)
 endfunction()