From 97b04a0b959badbecdb7604ba1fd3058a23f8b56 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fabien=20P=C3=A9an?= <pean.fabien@outlook.com>
Date: Wed, 30 Aug 2017 00:12:23 +0200
Subject: Add CMake function vcpkg_from_bitbucket

---
 scripts/cmake/vcpkg_common_functions.cmake |   1 +
 scripts/cmake/vcpkg_from_bitbucket.cmake   | 190 +++++++++++++++++++++++++++++
 2 files changed, 191 insertions(+)
 create mode 100644 scripts/cmake/vcpkg_from_bitbucket.cmake

(limited to 'scripts')

diff --git a/scripts/cmake/vcpkg_common_functions.cmake b/scripts/cmake/vcpkg_common_functions.cmake
index 29f0f8dff..81e8e5813 100644
--- a/scripts/cmake/vcpkg_common_functions.cmake
+++ b/scripts/cmake/vcpkg_common_functions.cmake
@@ -6,6 +6,7 @@ include(vcpkg_execute_required_process_repeat)
 include(vcpkg_find_acquire_program)
 include(vcpkg_fixup_cmake_targets)
 include(vcpkg_from_github)
+include(vcpkg_from_bitbucket)
 include(vcpkg_build_cmake)
 include(vcpkg_build_msbuild)
 include(vcpkg_build_qmake)
diff --git a/scripts/cmake/vcpkg_from_bitbucket.cmake b/scripts/cmake/vcpkg_from_bitbucket.cmake
new file mode 100644
index 000000000..227de5141
--- /dev/null
+++ b/scripts/cmake/vcpkg_from_bitbucket.cmake
@@ -0,0 +1,190 @@
+## # vcpkg_from_bitbucket
+##
+## Download and extract a project from Bitbucket.
+## Enables support for installing HEAD `vcpkg.exe install --head <port>`.
+##
+## ## Usage:
+## ```cmake
+## vcpkg_from_bitbucket(
+##     OUT_SOURCE_PATH <SOURCE_PATH>
+##     REPO <Microsoft/cpprestsdk>
+##     [REF <v2.0.0>]
+##     [SHA512 <45d0d7f8cc350...>]
+##     [HEAD_REF <master>]
+## )
+## ```
+##
+## ## Parameters:
+## ### OUT_SOURCE_PATH
+## Specifies the out-variable that will contain the extracted location.
+##
+## This should be set to `SOURCE_PATH` by convention.
+##
+## ### REPO
+## The organization or user and repository on GitHub.
+##
+## ### REF
+## A stable git commit-ish (ideally a tag) that will not change contents. **This should not be a branch.**
+##
+## For repositories without official releases, this can be set to the full commit id of the current latest master.
+##
+## If `REF` is specified, `SHA512` must also be specified.
+##
+## ### SHA512
+## The SHA512 hash that should match the archive (https://bitbucket.com/${REPO}/get/${REF}.tar.gz).
+##
+## This is most easily determined by first setting it to `1`, then trying to build the port. The error message will contain the full hash, which can be copied back into the portfile.
+##
+## ### HEAD_REF
+## The unstable git commit-ish (ideally a branch) to pull for `--head` builds.
+##
+## For most projects, this should be `master`. The chosen branch should be one that is expected to be always buildable on all supported platforms.
+##
+## ## Notes:
+## At least one of `REF` and `HEAD_REF` must be specified, however it is preferable for both to be present.
+##
+## This exports the `VCPKG_HEAD_VERSION` variable during head builds.
+##
+## ## Examples:
+##
+## * [blaze](https://github.com/Microsoft/vcpkg/blob/master/ports/blaze/portfile.cmake)
+function(vcpkg_from_bitbucket)
+    set(oneValueArgs OUT_SOURCE_PATH REPO REF SHA512 HEAD_REF)
+    set(multipleValuesArgs)
+    cmake_parse_arguments(_vdud "" "${oneValueArgs}" "${multipleValuesArgs}" ${ARGN})
+
+    if(NOT _vdud_OUT_SOURCE_PATH)
+        message(FATAL_ERROR "OUT_SOURCE_PATH must be specified.")
+    endif()
+
+    if((_vdud_REF AND NOT _vdud_SHA512) OR (NOT _vdud_REF AND _vdud_SHA512))
+        message(FATAL_ERROR "SHA512 must be specified if REF is specified.")
+    endif()
+
+    if(NOT _vdud_REPO)
+        message(FATAL_ERROR "The Bitbucket repository must be specified.")
+    endif()
+
+    if(NOT _vdud_REF AND NOT _vdud_HEAD_REF)
+        message(FATAL_ERROR "At least one of REF and HEAD_REF must be specified.")
+    endif()
+
+    string(REGEX REPLACE ".*/" "" REPO_NAME ${_vdud_REPO})
+    string(REGEX REPLACE "/.*" "" ORG_NAME ${_vdud_REPO})
+
+    macro(set_SOURCE_PATH BASE BASEREF)
+        set(SOURCE_PATH "${BASE}/${ORG_NAME}-${REPO_NAME}-${BASEREF}")
+        if(EXISTS ${SOURCE_PATH})
+            set(${_vdud_OUT_SOURCE_PATH} "${SOURCE_PATH}" PARENT_SCOPE)
+        else()
+            # Sometimes GitHub strips a leading 'v' off the REF.
+            string(REGEX REPLACE "^v" "" REF ${BASEREF})
+            set(SOURCE_PATH "${BASE}/${ORG_NAME}-${REPO_NAME}-${REF}")
+            if(EXISTS ${SOURCE_PATH})
+                set(${_vdud_OUT_SOURCE_PATH} "${SOURCE_PATH}" PARENT_SCOPE)
+            else()
+                message(FATAL_ERROR "Could not determine source path: '${BASE}/${ORG_NAME}-${REPO_NAME}-${BASEREF}' does not exist")
+            endif()
+        endif()
+    endmacro()
+
+    if(VCPKG_USE_HEAD_VERSION AND NOT _vdud_HEAD_REF)
+        message(STATUS "Package does not specify HEAD_REF. Falling back to non-HEAD version.")
+        set(VCPKG_USE_HEAD_VERSION OFF)
+    endif()
+    
+    # Handle --no-head scenarios
+    if(NOT VCPKG_USE_HEAD_VERSION)
+        if(NOT _vdud_REF)
+            message(FATAL_ERROR "Package does not specify REF. It must built using --head.")
+        endif()
+        
+        set(URL "https://bitbucket.com/${ORG_NAME}/${REPO_NAME}/get/${_vdud_REF}.tar.gz")
+        set(downloaded_file_path "${DOWNLOADS}/${ORG_NAME}-${REPO_NAME}-${_vdud_REF}.tar.gz")
+
+        file(DOWNLOAD "https://api.bitbucket.com/2.0/repositories/${ORG_NAME}/${REPO_NAME}/refs/tags/${_vdud_REF}"
+            ${downloaded_file_path}.version
+            STATUS download_status
+        )
+        list(GET download_status 0 status_code)
+        if ("${status_code}" STREQUAL "0")
+            # Parse the github refs response with regex.
+            # TODO: use some JSON swiss-army-knife utility instead.
+            file(READ "${downloaded_file_path}.version" _contents)
+            string(REGEX MATCH "\"hash\": \"[a-f0-9]+\"" x "${_contents}")
+            string(REGEX REPLACE "\"hash\": \"([a-f0-9]+)\"" "\\1" _version ${x})
+            string(SUBSTRING ${_version} 0 12 _version) # Get the 12 first numbers from commit hash
+        else()
+            set(_version ${_vdud_REF})
+        endif()
+        
+        vcpkg_download_distfile(ARCHIVE
+            URLS "https://bitbucket.com/${ORG_NAME}/${REPO_NAME}/get/${_vdud_REF}.tar.gz"
+            SHA512 "${_vdud_SHA512}"
+            FILENAME "${ORG_NAME}-${REPO_NAME}-${_vdud_REF}.tar.gz"
+        )
+        vcpkg_extract_source_archive_ex(ARCHIVE "${ARCHIVE}")
+        set_SOURCE_PATH(${CURRENT_BUILDTREES_DIR}/src ${_version})
+        return()
+    endif()
+
+    # The following is for --head scenarios
+    set(URL "https://bitbucket.com/${ORG_NAME}/${REPO_NAME}/get/${_vdud_HEAD_REF}.tar.gz")
+    set(downloaded_file_path "${DOWNLOADS}/${ORG_NAME}-${REPO_NAME}-${_vdud_HEAD_REF}.tar.gz")
+
+    if(_VCPKG_NO_DOWNLOADS)
+        if(NOT EXISTS ${downloaded_file_path} OR NOT EXISTS ${downloaded_file_path}.version)
+            message(FATAL_ERROR "Downloads are disabled, but '${downloaded_file_path}' does not exist.")
+        endif()
+        message(STATUS "Using cached ${downloaded_file_path}")
+    else()
+        if(EXISTS ${downloaded_file_path})
+            message(STATUS "Purging cached ${downloaded_file_path} to fetch latest (use --no-downloads to suppress)")
+            file(REMOVE ${downloaded_file_path})
+        endif()
+        if(EXISTS ${downloaded_file_path}.version)
+            file(REMOVE ${downloaded_file_path}.version)
+        endif()
+        if(EXISTS ${CURRENT_BUILDTREES_DIR}/src/head)
+            file(REMOVE_RECURSE ${CURRENT_BUILDTREES_DIR}/src/head)
+        endif()
+
+        # Try to download the file and version information from bitbucket.
+        message(STATUS "Downloading ${URL}...")
+        file(DOWNLOAD "https://api.bitbucket.com/2.0/repositories/${ORG_NAME}/${REPO_NAME}/refs/branches/${_vdud_HEAD_REF}"
+            ${downloaded_file_path}.version
+            STATUS download_status
+        )
+        list(GET download_status 0 status_code)
+        if (NOT "${status_code}" STREQUAL "0")
+            file(REMOVE ${downloaded_file_path}.version)
+            message(FATAL_ERROR "Downloading version info for ${URL}... Failed. Status: ${download_status}")
+        endif()
+
+        file(DOWNLOAD ${URL} ${downloaded_file_path} STATUS download_status)
+        list(GET download_status 0 status_code)
+        if (NOT "${status_code}" STREQUAL "0")
+            file(REMOVE ${downloaded_file_path})
+            message(FATAL_ERROR "Downloading ${URL}... Failed. Status: ${download_status}")
+        else()
+            message(STATUS "Downloading ${URL}... OK")
+        endif()
+    endif()
+
+    vcpkg_extract_source_archive_ex(
+        ARCHIVE "${downloaded_file_path}"
+        WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/src/head"
+    )
+
+    # Parse the github refs response with regex.
+    # TODO: use some JSON swiss-army-knife utility instead.
+    file(READ "${downloaded_file_path}.version" _contents)
+    string(REGEX MATCH "\"hash\": \"[a-f0-9]+\"" x "${_contents}")
+    string(REGEX REPLACE "\"hash\": \"([a-f0-9]+)\"" "\\1" _version ${x})
+    string(SUBSTRING ${_version} 0 12 _vdud_HEAD_REF) # Get the 12 first numbers from commit hash
+    
+    # exports VCPKG_HEAD_VERSION to the caller. This will get picked up by ports.cmake after the build.
+    set(VCPKG_HEAD_VERSION ${_version} PARENT_SCOPE)
+
+    set_SOURCE_PATH(${CURRENT_BUILDTREES_DIR}/src/head ${_vdud_HEAD_REF})
+endfunction()
-- 
cgit v1.2.3


From 26516fe485b0e9048dd4809256a7e4526957c6e9 Mon Sep 17 00:00:00 2001
From: Alexander Karatarakis <alkarata@microsoft.com>
Date: Sat, 9 Sep 2017 00:12:54 -0700
Subject: vcpkg_configure_cmake (and _meson) now embed debug symbols within
 static libs (/Z7)

---
 scripts/cmake/vcpkg_configure_cmake.cmake | 16 ++++++++--------
 scripts/cmake/vcpkg_configure_meson.cmake | 16 ++++++++--------
 2 files changed, 16 insertions(+), 16 deletions(-)

(limited to 'scripts')

diff --git a/scripts/cmake/vcpkg_configure_cmake.cmake b/scripts/cmake/vcpkg_configure_cmake.cmake
index 07acfc8ea..fecea8f1c 100644
--- a/scripts/cmake/vcpkg_configure_cmake.cmake
+++ b/scripts/cmake/vcpkg_configure_cmake.cmake
@@ -141,22 +141,22 @@ function(vcpkg_configure_cmake)
 
     if(DEFINED VCPKG_CRT_LINKAGE AND VCPKG_CRT_LINKAGE STREQUAL dynamic)
         list(APPEND _csc_OPTIONS_DEBUG
-            "-DCMAKE_CXX_FLAGS_DEBUG=/D_DEBUG /MDd /Zi /Ob0 /Od /RTC1 ${VCPKG_CXX_FLAGS_DEBUG}"
-            "-DCMAKE_C_FLAGS_DEBUG=/D_DEBUG /MDd /Zi /Ob0 /Od /RTC1 ${VCPKG_C_FLAGS_DEBUG}"
+            "-DCMAKE_CXX_FLAGS_DEBUG=/D_DEBUG /MDd /Z7 /Ob0 /Od /RTC1 ${VCPKG_CXX_FLAGS_DEBUG}"
+            "-DCMAKE_C_FLAGS_DEBUG=/D_DEBUG /MDd /Z7 /Ob0 /Od /RTC1 ${VCPKG_C_FLAGS_DEBUG}"
         )
         list(APPEND _csc_OPTIONS_RELEASE
-            "-DCMAKE_CXX_FLAGS_RELEASE=/MD /O2 /Oi /Gy /DNDEBUG /Zi ${VCPKG_CXX_FLAGS_RELEASE}"
-            "-DCMAKE_C_FLAGS_RELEASE=/MD /O2 /Oi /Gy /DNDEBUG /Zi ${VCPKG_C_FLAGS_RELEASE}"
+            "-DCMAKE_CXX_FLAGS_RELEASE=/MD /O2 /Oi /Gy /DNDEBUG /Z7 ${VCPKG_CXX_FLAGS_RELEASE}"
+            "-DCMAKE_C_FLAGS_RELEASE=/MD /O2 /Oi /Gy /DNDEBUG /Z7 ${VCPKG_C_FLAGS_RELEASE}"
         )
 
     elseif(DEFINED VCPKG_CRT_LINKAGE AND VCPKG_CRT_LINKAGE STREQUAL static)
         list(APPEND _csc_OPTIONS_DEBUG
-            "-DCMAKE_CXX_FLAGS_DEBUG=/D_DEBUG /MTd /Zi /Ob0 /Od /RTC1 ${VCPKG_CXX_FLAGS_DEBUG}"
-            "-DCMAKE_C_FLAGS_DEBUG=/D_DEBUG /MTd /Zi /Ob0 /Od /RTC1 ${VCPKG_C_FLAGS_DEBUG}"
+            "-DCMAKE_CXX_FLAGS_DEBUG=/D_DEBUG /MTd /Z7 /Ob0 /Od /RTC1 ${VCPKG_CXX_FLAGS_DEBUG}"
+            "-DCMAKE_C_FLAGS_DEBUG=/D_DEBUG /MTd /Z7 /Ob0 /Od /RTC1 ${VCPKG_C_FLAGS_DEBUG}"
         )
         list(APPEND _csc_OPTIONS_RELEASE
-            "-DCMAKE_CXX_FLAGS_RELEASE=/MT /O2 /Oi /Gy /DNDEBUG /Zi ${VCPKG_CXX_FLAGS_RELEASE}"
-            "-DCMAKE_C_FLAGS_RELEASE=/MT /O2 /Oi /Gy /DNDEBUG /Zi ${VCPKG_C_FLAGS_RELEASE}"
+            "-DCMAKE_CXX_FLAGS_RELEASE=/MT /O2 /Oi /Gy /DNDEBUG /Z7 ${VCPKG_CXX_FLAGS_RELEASE}"
+            "-DCMAKE_C_FLAGS_RELEASE=/MT /O2 /Oi /Gy /DNDEBUG /Z7 ${VCPKG_C_FLAGS_RELEASE}"
         )
     endif()
 
diff --git a/scripts/cmake/vcpkg_configure_meson.cmake b/scripts/cmake/vcpkg_configure_meson.cmake
index 277f91e11..143bb74de 100644
--- a/scripts/cmake/vcpkg_configure_meson.cmake
+++ b/scripts/cmake/vcpkg_configure_meson.cmake
@@ -9,17 +9,17 @@ function(vcpkg_configure_meson)
     set(MESON_COMMON_CXXFLAGS "${MESON_COMMON_CXXFLAGS} /DWIN32 /D_WINDOWS /W3 /utf-8 /GR /EHsc")
     
     if(DEFINED VCPKG_CRT_LINKAGE AND VCPKG_CRT_LINKAGE STREQUAL dynamic)
-        set(MESON_DEBUG_CFLAGS "${MESON_DEBUG_CFLAGS} /D_DEBUG /MDd /Zi /Ob0 /Od /RTC1")
-        set(MESON_DEBUG_CXXFLAGS "${MESON_DEBUG_CXXFLAGS} /D_DEBUG /MDd /Zi /Ob0 /Od /RTC1")
+        set(MESON_DEBUG_CFLAGS "${MESON_DEBUG_CFLAGS} /D_DEBUG /MDd /Z7 /Ob0 /Od /RTC1")
+        set(MESON_DEBUG_CXXFLAGS "${MESON_DEBUG_CXXFLAGS} /D_DEBUG /MDd /Z7 /Ob0 /Od /RTC1")
         
-        set(MESON_RELEASE_CFLAGS "${MESON_RELEASE_CFLAGS} /MD /O2 /Oi /Gy /DNDEBUG /Zi")
-        set(MESON_RELEASE_CXXFLAGS "${MESON_RELEASE_CXXFLAGS} /MD /O2 /Oi /Gy /DNDEBUG /Zi")
+        set(MESON_RELEASE_CFLAGS "${MESON_RELEASE_CFLAGS} /MD /O2 /Oi /Gy /DNDEBUG /Z7")
+        set(MESON_RELEASE_CXXFLAGS "${MESON_RELEASE_CXXFLAGS} /MD /O2 /Oi /Gy /DNDEBUG /Z7")
     elseif(DEFINED VCPKG_CRT_LINKAGE AND VCPKG_CRT_LINKAGE STREQUAL static)
-        set(MESON_DEBUG_CFLAGS "${MESON_DEBUG_CFLAGS} /D_DEBUG /MTd /Zi /Ob0 /Od /RTC1")
-        set(MESON_DEBUG_CXXFLAGS "${MESON_DEBUG_CXXFLAGS} /D_DEBUG /MTd /Zi /Ob0 /Od /RTC1")
+        set(MESON_DEBUG_CFLAGS "${MESON_DEBUG_CFLAGS} /D_DEBUG /MTd /Z7 /Ob0 /Od /RTC1")
+        set(MESON_DEBUG_CXXFLAGS "${MESON_DEBUG_CXXFLAGS} /D_DEBUG /MTd /Z7 /Ob0 /Od /RTC1")
         
-        set(MESON_RELEASE_CFLAGS "${MESON_RELEASE_CFLAGS} /MT /O2 /Oi /Gy /DNDEBUG /Zi")
-        set(MESON_RELEASE_CXXFLAGS "${MESON_RELEASE_CXXFLAGS} /MT /O2 /Oi /Gy /DNDEBUG /Zi")
+        set(MESON_RELEASE_CFLAGS "${MESON_RELEASE_CFLAGS} /MT /O2 /Oi /Gy /DNDEBUG /Z7")
+        set(MESON_RELEASE_CXXFLAGS "${MESON_RELEASE_CXXFLAGS} /MT /O2 /Oi /Gy /DNDEBUG /Z7")
     endif()
     
     set(MESON_COMMON_LDFLAGS "${MESON_COMMON_LDFLAGS} /DEBUG")
-- 
cgit v1.2.3


From e915ab0466956bb16985402ef51a6dace2897420 Mon Sep 17 00:00:00 2001
From: Jared Szechy <jared.szechy@gmail.com>
Date: Tue, 12 Sep 2017 20:13:34 -0400
Subject: Update to latest python 3.5 patch

---
 scripts/cmake/vcpkg_find_acquire_program.cmake | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'scripts')

diff --git a/scripts/cmake/vcpkg_find_acquire_program.cmake b/scripts/cmake/vcpkg_find_acquire_program.cmake
index fef62da53..e718fc7da 100644
--- a/scripts/cmake/vcpkg_find_acquire_program.cmake
+++ b/scripts/cmake/vcpkg_find_acquire_program.cmake
@@ -67,9 +67,9 @@ function(vcpkg_find_acquire_program VAR)
   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(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")
-- 
cgit v1.2.3


From cbc3050b44a14bdd252d174072911d1dadcd8eff Mon Sep 17 00:00:00 2001
From: glachancecmaisonneuve <glachance@cmaisonneuve.qc.ca>
Date: Sun, 17 Sep 2017 02:33:41 -0400
Subject: find_acquire_program fix for python2 python2 version bump

---
 scripts/cmake/vcpkg_find_acquire_program.cmake | 30 ++++++++------------------
 1 file changed, 9 insertions(+), 21 deletions(-)

(limited to 'scripts')

diff --git a/scripts/cmake/vcpkg_find_acquire_program.cmake b/scripts/cmake/vcpkg_find_acquire_program.cmake
index e718fc7da..47fbc7801 100644
--- a/scripts/cmake/vcpkg_find_acquire_program.cmake
+++ b/scripts/cmake/vcpkg_find_acquire_program.cmake
@@ -66,31 +66,19 @@ function(vcpkg_find_acquire_program VAR)
     set(HASH 850b26be5bbbdaeaf45ac39dd27f69f1a85e600c35afbd16b9f621396b3c7a19863ea3ff316b025b578fce0a8280eef2203306a2b3e46ee1389abb65313fb720)
   elseif(VAR MATCHES "PYTHON3")
     set(PROGNAME python)
-    set(PATHS ${DOWNLOADS}/tools/python)
+    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)
-- 
cgit v1.2.3


From 39a96fc2f4a7d471ab3fa16c480fc0d9965605b1 Mon Sep 17 00:00:00 2001
From: Alexander Karatarakis <alkarata@microsoft.com>
Date: Fri, 15 Sep 2017 16:47:07 -0700
Subject: Bump required version of CMake to 3.9.2

---
 scripts/fetchDependency.ps1 | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'scripts')

diff --git a/scripts/fetchDependency.ps1 b/scripts/fetchDependency.ps1
index c9aeb0f77..4aca0c811 100644
--- a/scripts/fetchDependency.ps1
+++ b/scripts/fetchDependency.ps1
@@ -105,12 +105,12 @@ function SelectProgram([Parameter(Mandatory=$true)][string]$Dependency)
 
     if($Dependency -eq "cmake")
     {
-        $requiredVersion = "3.9.1"
-        $downloadVersion = "3.9.1"
-        $url = "https://cmake.org/files/v3.9/cmake-3.9.1-win32-x86.zip"
-        $downloadPath = "$downloadsDir\cmake-3.9.1-win32-x86.zip"
-        $expectedDownloadedFileHash = "e0d9501bd34e3100e925dcb2e07f5f0ce8980bdbe5fce0ae950b21368d54c1a1"
-        $executableFromDownload = "$downloadsDir\cmake-3.9.1-win32-x86\bin\cmake.exe"
+        $requiredVersion = "3.9.2"
+        $downloadVersion = "3.9.2"
+        $url = "https://cmake.org/files/v3.9/cmake-3.9.2-win32-x86.zip"
+        $downloadPath = "$downloadsDir\cmake-3.9.2-win32-x86.zip"
+        $expectedDownloadedFileHash = "9fe68d50f065666cb2861f53751390f15c6363c440e86a07677689378bb8329f"
+        $executableFromDownload = "$downloadsDir\cmake-3.9.2-win32-x86\bin\cmake.exe"
         $extractionType = $ExtractionType_ZIP
         $extractionFolder = $downloadsDir
     }
-- 
cgit v1.2.3


From 548b7f69197fad294f44b6e3ae5f587116220fae Mon Sep 17 00:00:00 2001
From: Alexander Karatarakis <alkarata@microsoft.com>
Date: Fri, 22 Sep 2017 14:20:27 -0700
Subject: Bump required version of CMake to 3.9.3

3.9.3 contains this interesting change:
FindBoost: Add support for Boost 1.65.0 and 1.65.1 to CMake 3.9
---
 scripts/fetchDependency.ps1 | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'scripts')

diff --git a/scripts/fetchDependency.ps1 b/scripts/fetchDependency.ps1
index 4aca0c811..2a23002a4 100644
--- a/scripts/fetchDependency.ps1
+++ b/scripts/fetchDependency.ps1
@@ -105,12 +105,12 @@ function SelectProgram([Parameter(Mandatory=$true)][string]$Dependency)
 
     if($Dependency -eq "cmake")
     {
-        $requiredVersion = "3.9.2"
-        $downloadVersion = "3.9.2"
-        $url = "https://cmake.org/files/v3.9/cmake-3.9.2-win32-x86.zip"
-        $downloadPath = "$downloadsDir\cmake-3.9.2-win32-x86.zip"
-        $expectedDownloadedFileHash = "9fe68d50f065666cb2861f53751390f15c6363c440e86a07677689378bb8329f"
-        $executableFromDownload = "$downloadsDir\cmake-3.9.2-win32-x86\bin\cmake.exe"
+        $requiredVersion = "3.9.3"
+        $downloadVersion = "3.9.3"
+        $url = "https://cmake.org/files/v3.9/cmake-3.9.3-win32-x86.zip"
+        $downloadPath = "$downloadsDir\cmake-3.9.3-win32-x86.zip"
+        $expectedDownloadedFileHash = "47870e3d4c9a5aa019e71020cd85cc60b6f2d2569fb239eaec204cd991e512f1"
+        $executableFromDownload = "$downloadsDir\cmake-3.9.3-win32-x86\bin\cmake.exe"
         $extractionType = $ExtractionType_ZIP
         $extractionFolder = $downloadsDir
     }
-- 
cgit v1.2.3


From 06798b6528b777ba2e2a9af59774309db5cf5e52 Mon Sep 17 00:00:00 2001
From: glachancecmaisonneuve <glachance@cmaisonneuve.qc.ca>
Date: Mon, 25 Sep 2017 13:05:32 -0400
Subject: Fix for BUILD_ARGS being always added in non ninja build

---
 scripts/cmake/vcpkg_build_cmake.cmake   | 30 +++++++++++++++++++++++++++++-
 scripts/cmake/vcpkg_install_cmake.cmake |  6 ++++--
 2 files changed, 33 insertions(+), 3 deletions(-)

(limited to 'scripts')

diff --git a/scripts/cmake/vcpkg_build_cmake.cmake b/scripts/cmake/vcpkg_build_cmake.cmake
index 18e2a8b00..546071a36 100644
--- a/scripts/cmake/vcpkg_build_cmake.cmake
+++ b/scripts/cmake/vcpkg_build_cmake.cmake
@@ -1,3 +1,29 @@
+## # vcpkg_build_cmake
+##
+## Build a cmake project.
+##
+## ## Usage:
+## ```cmake
+## vcpkg_build_cmake([MSVC_64_TOOLSET] [DISABLE_PARALLEL])
+## ```
+##
+## ## Parameters:
+## ### MSVC_64_TOOLSET
+## This adds the `/p:PreferredToolArchitecture=x64` switch to the underlying buildsystem parameters. Some large projects can run out of memory when linking if they use the 32-bit hosted tools.
+##
+## ### DISABLE_PARALLEL
+## The /m parameter will not be added to the underlying buildsystem parameters
+##
+## ## Notes:
+## This command should be preceeded by a call to [`vcpkg_configure_cmake()`](vcpkg_configure_cmake.md).
+## Use [`vcpkg_install_cmake()`](vcpkg_configure_cmake.md) function if your CMake script supports the "install" target
+##
+## ## Examples:
+##
+## * [zlib](https://github.com/Microsoft/vcpkg/blob/master/ports/zlib/portfile.cmake)
+## * [cpprestsdk](https://github.com/Microsoft/vcpkg/blob/master/ports/cpprestsdk/portfile.cmake)
+## * [poco](https://github.com/Microsoft/vcpkg/blob/master/ports/poco/portfile.cmake)
+## * [opencv](https://github.com/Microsoft/vcpkg/blob/master/ports/opencv/portfile.cmake)
 function(vcpkg_build_cmake)
     cmake_parse_arguments(_bc "MSVC_64_TOOLSET;DISABLE_PARALLEL" "" "" ${ARGN})
 
@@ -19,7 +45,9 @@ function(vcpkg_build_cmake)
 
     if(EXISTS ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/build.ninja)
         set(BUILD_ARGS -v) # verbose output
-    else()
+	endif()
+	
+    if(_bc_MSVC_64_TOOLSET)
         set(BUILD_ARGS ${MSVC_EXTRA_ARGS})
     endif()
 
diff --git a/scripts/cmake/vcpkg_install_cmake.cmake b/scripts/cmake/vcpkg_install_cmake.cmake
index f778007ef..34ac15fe6 100644
--- a/scripts/cmake/vcpkg_install_cmake.cmake
+++ b/scripts/cmake/vcpkg_install_cmake.cmake
@@ -9,7 +9,7 @@
 ##
 ## ## Parameters:
 ## ### MSVC_64_TOOLSET
-## This adds the `/p:PreferredToolArchitecture=x64` switch if the underlying buildsystem is MSBuild. Some large projects can run out of memory when linking if they use the 32-bit hosted tools.
+## This adds the `/p:PreferredToolArchitecture=x64` switch to the underlying buildsystem parameters. Some large projects can run out of memory when linking if they use the 32-bit hosted tools.
 ##
 ## ## Notes:
 ## This command should be preceeded by a call to [`vcpkg_configure_cmake()`](vcpkg_configure_cmake.md).
@@ -41,7 +41,9 @@ function(vcpkg_install_cmake)
     
     if(EXISTS ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/build.ninja)
         set(BUILD_ARGS -v) # verbose output
-    else()
+	endif()
+	
+    if(_bc_MSVC_64_TOOLSET)
         set(BUILD_ARGS ${MSVC_EXTRA_ARGS})
     endif()
 
-- 
cgit v1.2.3


From c6149fae2f9f33d9ed363650aee6aea642574b0a Mon Sep 17 00:00:00 2001
From: Konstantin Podsvirov <konstantin@podsvirov.pro>
Date: Wed, 27 Sep 2017 02:57:51 +0300
Subject: [vcpkg-export-ifw] Usage QtIFW tools

Download and use tools to make repository and installer
---
 scripts/fetchDependency.ps1 | 11 +++++++++++
 1 file changed, 11 insertions(+)

(limited to 'scripts')

diff --git a/scripts/fetchDependency.ps1 b/scripts/fetchDependency.ps1
index 2a23002a4..25447c19b 100644
--- a/scripts/fetchDependency.ps1
+++ b/scripts/fetchDependency.ps1
@@ -137,6 +137,17 @@ function SelectProgram([Parameter(Mandatory=$true)][string]$Dependency)
         $extractionType = $ExtractionType_ZIP
         $extractionFolder = "$downloadsDir\MinGit-2.14.1-32-bit"
     }
+    elseif($Dependency -eq "installerbase")
+    {
+        $requiredVersion = "3.1.81"
+        $downloadVersion = "3.1.81"
+        $url = "https://github.com/podsvirov/installer-framework/releases/download/cr203958-9/QtInstallerFramework-win-x86.zip"
+        $downloadPath = "$downloadsDir\QtInstallerFramework-win-x86.zip"
+        $expectedDownloadedFileHash = "f2ce23cf5cf9fc7ce409bdca49328e09a070c0026d3c8a04e4dfde7b05b83fe8"
+        $executableFromDownload = "$downloadsDir\QtInstallerFramework-win-x86\bin\installerbase.exe"
+        $extractionType = $ExtractionType_ZIP
+        $extractionFolder = $downloadsDir
+    }
     else
     {
         throw "Unknown program requested"
-- 
cgit v1.2.3


From 58418e73736d267bb921d6b4568e39710fcfdacb Mon Sep 17 00:00:00 2001
From: Tsukasa Sugiura <t.sugiura0204@gmail.com>
Date: Tue, 3 Oct 2017 00:55:54 +0900
Subject: Add Dark support

Add Dark support to vcpkg_find_acquire_program().
---
 scripts/cmake/vcpkg_find_acquire_program.cmake | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'scripts')

diff --git a/scripts/cmake/vcpkg_find_acquire_program.cmake b/scripts/cmake/vcpkg_find_acquire_program.cmake
index e718fc7da..69e439001 100644
--- a/scripts/cmake/vcpkg_find_acquire_program.cmake
+++ b/scripts/cmake/vcpkg_find_acquire_program.cmake
@@ -152,6 +152,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()
-- 
cgit v1.2.3


From 0ba3c166d76a4484fd4d378dc7367f2794577a20 Mon Sep 17 00:00:00 2001
From: Jens Frederich <jens.frederich@vector.com>
Date: Wed, 4 Oct 2017 08:19:57 +0200
Subject: Get proxy credentials behind web proxy

---
 scripts/bootstrap.ps1 | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'scripts')

diff --git a/scripts/bootstrap.ps1 b/scripts/bootstrap.ps1
index b7bc5afab..fa51de404 100644
--- a/scripts/bootstrap.ps1
+++ b/scripts/bootstrap.ps1
@@ -4,6 +4,10 @@ param(
     [string]$disableMetrics = "0"
 )
 
+$webclient=New-Object System.Net.WebClient
+$creds=Get-Credential
+$webclient.Proxy.Credentials=$creds
+
 $scriptsDir = split-path -parent $MyInvocation.MyCommand.Definition
 $vcpkgRootDir = & $scriptsDir\findFileRecursivelyUp.ps1 $scriptsDir .vcpkg-root
 
-- 
cgit v1.2.3


From 6f763c5ca830c9e461e106c63959a60d33eb5e5b Mon Sep 17 00:00:00 2001
From: Konstantin Podsvirov <konstantin@podsvirov.pro>
Date: Thu, 5 Oct 2017 21:24:32 +0300
Subject: [vcpkg-export-ifw] Maintenance Tool

Install maintenance tool and create Start menu shortcuts
to manage, update and uninstall packages.
---
 scripts/ifw/maintenance.qs | 46 ++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 46 insertions(+)
 create mode 100644 scripts/ifw/maintenance.qs

(limited to 'scripts')

diff --git a/scripts/ifw/maintenance.qs b/scripts/ifw/maintenance.qs
new file mode 100644
index 000000000..5cdad7225
--- /dev/null
+++ b/scripts/ifw/maintenance.qs
@@ -0,0 +1,46 @@
+// constructor
+function Component()
+{
+    installer.installationStarted.connect(this, Component.prototype.onInstallationStarted);
+}
+
+Component.prototype.onInstallationStarted = function()
+{
+    if (component.updateRequested() || component.installationRequested()) {
+        if (installer.value("os") == "win")
+            component.installerbaseBinaryPath = "@TargetDir@/tempmaintenancetool.exe";
+        installer.setInstallerBaseBinary(component.installerbaseBinaryPath);
+    }
+}
+
+Component.prototype.createOperations = function()
+{
+    // call the base createOperations
+    component.createOperations();
+
+    // only for windows online installer
+    if ( installer.value("os") == "win" && !installer.isOfflineOnly() )
+    {
+        // shortcut to add or remove packages
+        component.addOperation( "CreateShortcut",
+                                "@TargetDir@/maintenancetool.exe",
+                                "@StartMenuDir@/Manage vcpkg.lnk",
+                                " --manage-packages");
+        // shortcut to update packages
+        component.addOperation( "CreateShortcut",
+                                "@TargetDir@/maintenancetool.exe",
+                                "@StartMenuDir@/Update vcpkg.lnk",
+                                " --updater");
+    }
+
+    // create uninstall link only for windows
+    if (installer.value("os") == "win")
+    {
+        // shortcut to uninstaller
+        component.addOperation( "CreateShortcut",
+                                "@TargetDir@/maintenancetool.exe",
+                                "@StartMenuDir@/Uninstall vcpkg.lnk",
+                                " --uninstall");
+    }
+}
+
-- 
cgit v1.2.3


From 2c9ee072da34a925f0faf22596e532d378930582 Mon Sep 17 00:00:00 2001
From: Robert Schumacher <roschuma@microsoft.com>
Date: Thu, 5 Oct 2017 17:49:28 -0700
Subject: [vcpkg_build_cmake] Refactor _build_ and _install_ into a single
 cmake script.

Regenerate documentation. Remove MSVC_64_TOOLSET option because it's obsolete.
---
 scripts/cmake/vcpkg_build_cmake.cmake     | 65 +++++++++++++++++--------------
 scripts/cmake/vcpkg_configure_cmake.cmake |  2 +
 scripts/cmake/vcpkg_install_cmake.cmake   | 50 +++---------------------
 3 files changed, 43 insertions(+), 74 deletions(-)

(limited to 'scripts')

diff --git a/scripts/cmake/vcpkg_build_cmake.cmake b/scripts/cmake/vcpkg_build_cmake.cmake
index 546071a36..5dc81ec09 100644
--- a/scripts/cmake/vcpkg_build_cmake.cmake
+++ b/scripts/cmake/vcpkg_build_cmake.cmake
@@ -4,19 +4,21 @@
 ##
 ## ## Usage:
 ## ```cmake
-## vcpkg_build_cmake([MSVC_64_TOOLSET] [DISABLE_PARALLEL])
+## vcpkg_build_cmake([DISABLE_PARALLEL] [TARGET <target>])
 ## ```
 ##
 ## ## Parameters:
-## ### MSVC_64_TOOLSET
-## This adds the `/p:PreferredToolArchitecture=x64` switch to the underlying buildsystem parameters. Some large projects can run out of memory when linking if they use the 32-bit hosted tools.
-##
 ## ### DISABLE_PARALLEL
-## The /m parameter will not be added to the underlying buildsystem parameters
+## The underlying buildsystem will be instructed to not parallelize
+##
+## ### TARGET
+## The target passed to the cmake build command (`cmake --build . --target <target>`). If not specified, no target will
+## be passed.
 ##
 ## ## Notes:
 ## This command should be preceeded by a call to [`vcpkg_configure_cmake()`](vcpkg_configure_cmake.md).
-## Use [`vcpkg_install_cmake()`](vcpkg_configure_cmake.md) function if your CMake script supports the "install" target
+## You can use the alias [`vcpkg_install_cmake()`](vcpkg_configure_cmake.md) function if your CMake script supports the
+## "install" target
 ##
 ## ## Examples:
 ##
@@ -25,45 +27,50 @@
 ## * [poco](https://github.com/Microsoft/vcpkg/blob/master/ports/poco/portfile.cmake)
 ## * [opencv](https://github.com/Microsoft/vcpkg/blob/master/ports/opencv/portfile.cmake)
 function(vcpkg_build_cmake)
-    cmake_parse_arguments(_bc "MSVC_64_TOOLSET;DISABLE_PARALLEL" "" "" ${ARGN})
-
-    set(MSVC_EXTRA_ARGS
-        "/p:VCPkgLocalAppDataDisabled=true"
-        "/p:UseIntelMKL=No"
-    )
+    cmake_parse_arguments(_bc "DISABLE_PARALLEL" "TARGET;LOGFILE_ROOT" "" ${ARGN})
 
-    # Specifies the architecture of the toolset, NOT the architecture of the produced binary
-    # This can help libraries that cause the linker to run out of memory.
-    # https://support.microsoft.com/en-us/help/2891057/linker-fatal-error-lnk1102-out-of-memory
-    if (_bc_MSVC_64_TOOLSET)
-        list(APPEND MSVC_EXTRA_ARGS "/p:PreferredToolArchitecture=x64")
+    if(NOT _bc_LOGFILE_ROOT)
+        set(_bc_LOGFILE_ROOT "build")
     endif()
 
-    if (NOT _bc_DISABLE_PARALLEL)
-        list(APPEND MSVC_EXTRA_ARGS "/m")
+    if(_VCPKG_CMAKE_GENERATOR MATCHES "Ninja")
+        set(BUILD_ARGS "-v") # verbose output
+        if (_bc_DISABLE_PARALLEL)
+            list(APPEND BUILD_ARGS "-j1")
+        endif()
+    elseif(_VCPKG_CMAKE_GENERATOR MATCHES "Visual Studio")
+        set(BUILD_ARGS
+            "/p:VCPkgLocalAppDataDisabled=true"
+            "/p:UseIntelMKL=No"
+        )
+        if (NOT _bc_DISABLE_PARALLEL)
+            list(APPEND BUILD_ARGS "/m")
+        endif()
+    elseif(_VCPKG_CMAKE_GENERATOR MATCHES "NMake")
+        # No options are currently added for nmake builds
+    else()
+        message(FATAL_ERROR "Unrecognized GENERATOR setting from vcpkg_configure_cmake(). Valid generators are: Ninja, Visual Studio, and NMake Makefiles")
     endif()
 
-    if(EXISTS ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/build.ninja)
-        set(BUILD_ARGS -v) # verbose output
-	endif()
-	
-    if(_bc_MSVC_64_TOOLSET)
-        set(BUILD_ARGS ${MSVC_EXTRA_ARGS})
+    if(_bc_TARGET)
+        set(TARGET_PARAM "--target" ${_bc_TARGET})
+    else()
+        set(TARGET_PARAM)
     endif()
 
     message(STATUS "Build ${TARGET_TRIPLET}-rel")
     vcpkg_execute_required_process(
-        COMMAND ${CMAKE_COMMAND} --build . --config Release -- ${BUILD_ARGS}
+        COMMAND ${CMAKE_COMMAND} --build . --config Release ${TARGET_PARAM} -- ${BUILD_ARGS}
         WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel
-        LOGNAME build-${TARGET_TRIPLET}-rel
+        LOGNAME ${_bc_LOGFILE_ROOT}-${TARGET_TRIPLET}-rel
     )
     message(STATUS "Build ${TARGET_TRIPLET}-rel done")
 
     message(STATUS "Build ${TARGET_TRIPLET}-dbg")
     vcpkg_execute_required_process(
-        COMMAND ${CMAKE_COMMAND} --build . --config Debug -- ${BUILD_ARGS}
+        COMMAND ${CMAKE_COMMAND} --build . --config Debug ${TARGET_PARAM} -- ${BUILD_ARGS}
         WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg
-        LOGNAME build-${TARGET_TRIPLET}-dbg
+        LOGNAME ${_bc_LOGFILE_ROOT}-${TARGET_TRIPLET}-dbg
     )
     message(STATUS "Build ${TARGET_TRIPLET}-dbg done")
 endfunction()
diff --git a/scripts/cmake/vcpkg_configure_cmake.cmake b/scripts/cmake/vcpkg_configure_cmake.cmake
index fecea8f1c..fe8c97c52 100644
--- a/scripts/cmake/vcpkg_configure_cmake.cmake
+++ b/scripts/cmake/vcpkg_configure_cmake.cmake
@@ -188,4 +188,6 @@ function(vcpkg_configure_cmake)
         LOGNAME config-${TARGET_TRIPLET}-dbg
     )
     message(STATUS "Configuring ${TARGET_TRIPLET}-dbg done")
+
+    set(_VCPKG_CMAKE_GENERATOR "${GENERATOR}" PARENT_SCOPE)
 endfunction()
\ No newline at end of file
diff --git a/scripts/cmake/vcpkg_install_cmake.cmake b/scripts/cmake/vcpkg_install_cmake.cmake
index 34ac15fe6..ab72d054e 100644
--- a/scripts/cmake/vcpkg_install_cmake.cmake
+++ b/scripts/cmake/vcpkg_install_cmake.cmake
@@ -4,15 +4,15 @@
 ##
 ## ## Usage:
 ## ```cmake
-## vcpkg_install_cmake([MSVC_64_TOOLSET])
+## vcpkg_install_cmake(...)
 ## ```
 ##
 ## ## Parameters:
-## ### MSVC_64_TOOLSET
-## This adds the `/p:PreferredToolArchitecture=x64` switch to the underlying buildsystem parameters. Some large projects can run out of memory when linking if they use the 32-bit hosted tools.
+## See [`vcpkg_build_cmake()`](vcpkg_build_cmake.md).
 ##
 ## ## Notes:
-## This command should be preceeded by a call to [`vcpkg_configure_cmake()`](vcpkg_configure_cmake.md).
+## This command transparently forwards to [`vcpkg_build_cmake()`](vcpkg_build_cmake.md), adding a `TARGET install`
+## parameter.
 ##
 ## ## Examples:
 ##
@@ -21,45 +21,5 @@
 ## * [poco](https://github.com/Microsoft/vcpkg/blob/master/ports/poco/portfile.cmake)
 ## * [opencv](https://github.com/Microsoft/vcpkg/blob/master/ports/opencv/portfile.cmake)
 function(vcpkg_install_cmake)
-    cmake_parse_arguments(_bc "MSVC_64_TOOLSET;DISABLE_PARALLEL" "" "" ${ARGN})
-
-    set(MSVC_EXTRA_ARGS
-        "/p:VCPkgLocalAppDataDisabled=true"
-        "/p:UseIntelMKL=No"
-    )
-
-    # Specifies the architecture of the toolset, NOT the architecture of the produced binary
-    # This can help libraries that cause the linker to run out of memory.
-    # https://support.microsoft.com/en-us/help/2891057/linker-fatal-error-lnk1102-out-of-memory
-    if (_bc_MSVC_64_TOOLSET)
-        list(APPEND MSVC_EXTRA_ARGS "/p:PreferredToolArchitecture=x64")
-    endif()
-
-    if (NOT _bc_DISABLE_PARALLEL)
-        list(APPEND MSVC_EXTRA_ARGS "/m")
-    endif()
-    
-    if(EXISTS ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/build.ninja)
-        set(BUILD_ARGS -v) # verbose output
-	endif()
-	
-    if(_bc_MSVC_64_TOOLSET)
-        set(BUILD_ARGS ${MSVC_EXTRA_ARGS})
-    endif()
-
-    message(STATUS "Package ${TARGET_TRIPLET}-rel")
-    vcpkg_execute_required_process(
-        COMMAND ${CMAKE_COMMAND} --build . --config Release --target install -- ${BUILD_ARGS}
-        WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel
-        LOGNAME package-${TARGET_TRIPLET}-rel
-    )
-    message(STATUS "Package ${TARGET_TRIPLET}-rel done")
-
-    message(STATUS "Package ${TARGET_TRIPLET}-dbg")
-    vcpkg_execute_required_process(
-        COMMAND ${CMAKE_COMMAND} --build . --config Debug --target install -- ${BUILD_ARGS}
-        WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg
-        LOGNAME package-${TARGET_TRIPLET}-dbg
-    )
-    message(STATUS "Package ${TARGET_TRIPLET}-dbg done")
+    vcpkg_build_cmake(LOGFILE_ROOT install TARGET install ${ARGN})
 endfunction()
-- 
cgit v1.2.3


From 9a963f7eff1981d4e894ea8b297d092cda60b764 Mon Sep 17 00:00:00 2001
From: Alexander Karatarakis <alkarata@microsoft.com>
Date: Thu, 5 Oct 2017 13:51:28 -0700
Subject: Overhaul VS selection. Add triplet option to specify VS instance

---
 scripts/get_triplet_environment.cmake | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'scripts')

diff --git a/scripts/get_triplet_environment.cmake b/scripts/get_triplet_environment.cmake
index 69e06bf97..b32f840d2 100644
--- a/scripts/get_triplet_environment.cmake
+++ b/scripts/get_triplet_environment.cmake
@@ -5,4 +5,5 @@ message("c35112b6-d1ba-415b-aa5d-81de856ef8eb")
 message("VCPKG_TARGET_ARCHITECTURE=${VCPKG_TARGET_ARCHITECTURE}")
 message("VCPKG_CMAKE_SYSTEM_NAME=${VCPKG_CMAKE_SYSTEM_NAME}")
 message("VCPKG_CMAKE_SYSTEM_VERSION=${VCPKG_CMAKE_SYSTEM_VERSION}")
-message("VCPKG_PLATFORM_TOOLSET=${VCPKG_PLATFORM_TOOLSET}")
\ No newline at end of file
+message("VCPKG_PLATFORM_TOOLSET=${VCPKG_PLATFORM_TOOLSET}")
+message("VCPKG_VISUAL_STUDIO_PATH=${VCPKG_VISUAL_STUDIO_PATH}")
\ No newline at end of file
-- 
cgit v1.2.3


From eca5a8b8d48d24c1a50fac58797af45dc5e83110 Mon Sep 17 00:00:00 2001
From: Alexander Karatarakis <alkarata@microsoft.com>
Date: Thu, 5 Oct 2017 14:27:36 -0700
Subject: Add vswhere in fetchDependency.ps1

---
 scripts/fetchDependency.ps1 | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

(limited to 'scripts')

diff --git a/scripts/fetchDependency.ps1 b/scripts/fetchDependency.ps1
index 25447c19b..80d6d2abb 100644
--- a/scripts/fetchDependency.ps1
+++ b/scripts/fetchDependency.ps1
@@ -119,11 +119,21 @@ function SelectProgram([Parameter(Mandatory=$true)][string]$Dependency)
         $requiredVersion = "4.1.0"
         $downloadVersion = "4.1.0"
         $url = "https://dist.nuget.org/win-x86-commandline/v4.1.0/nuget.exe"
-        $downloadPath = "$downloadsDir\nuget-4.1.0\nuget.exe"
+        $downloadPath = "$downloadsDir\nuget-$downloadVersion\nuget.exe"
         $expectedDownloadedFileHash = "4c1de9b026e0c4ab087302ff75240885742c0faa62bd2554f913bbe1f6cb63a0"
         $executableFromDownload = $downloadPath
         $extractionType = $ExtractionType_NO_EXTRACTION_REQUIRED
     }
+    elseif($Dependency -eq "vswhere")
+    {
+        $requiredVersion = "2.1.4"
+        $downloadVersion = "2.1.4"
+        $url = "https://github.com/Microsoft/vswhere/releases/download/2.1.4/vswhere.exe"
+        $downloadPath = "$downloadsDir\vswhere-$downloadVersion\vswhere.exe"
+        $expectedDownloadedFileHash = "548fb9dfeed59bc4ddcce739a5729e9c8dd5932cd60ff6f74727ee069e7da458"
+        $executableFromDownload = $downloadPath
+        $extractionType = $ExtractionType_NO_EXTRACTION_REQUIRED
+    }
     elseif($Dependency -eq "git")
     {
         $requiredVersion = "2.14.1"
-- 
cgit v1.2.3


From f0c23aeb6b238ee0ba2dc272ee4c193f2f777460 Mon Sep 17 00:00:00 2001
From: Alexander Karatarakis <alkarata@microsoft.com>
Date: Thu, 5 Oct 2017 18:25:34 -0700
Subject: Completely rework Visual Studio detection

- Now using vswhere.exe to detect all VS instance (2015 + 2017)
- Default version preference order is now: stable, prerelease, legacy
- Within each preference weight, the latest one is chosen
- findVisualStudioInstallationInstances.ps1 now has a parameter to choose VS instance
---
 scripts/findAnyMSBuildWithCppPlatformToolset.ps1  | 172 ++++------------------
 scripts/findVisualStudioInstallationInstances.ps1 |  49 +++---
 2 files changed, 55 insertions(+), 166 deletions(-)

(limited to 'scripts')

diff --git a/scripts/findAnyMSBuildWithCppPlatformToolset.ps1 b/scripts/findAnyMSBuildWithCppPlatformToolset.ps1
index f72491e5d..632cc2cdf 100644
--- a/scripts/findAnyMSBuildWithCppPlatformToolset.ps1
+++ b/scripts/findAnyMSBuildWithCppPlatformToolset.ps1
@@ -1,164 +1,50 @@
 [CmdletBinding()]
 param(
     [Parameter(Mandatory=$False)]
-    [switch]$DisableVS2017 = $False,
-
-    [Parameter(Mandatory=$False)]
-    [switch]$DisableVS2015 = $False
+    [string]$explicitlyRequestedVSPath = ""
 )
 
-if ($DisableVS2017 -and $DisableVS2015)
-{
-    throw "Both VS2015 and VS2017 were disabled."
-}
-
-function New-MSBuildInstance()
-{
-    param ($msbuildExePath, $toolsetVersion)
-
-    $instance = new-object PSObject
-    $instance | add-member -type NoteProperty -Name msbuildExePath -Value $msbuildExePath
-    $instance | add-member -type NoteProperty -Name toolsetVersion -Value $toolsetVersion
+$explicitlyRequestedVSPath = $explicitlyRequestedVSPath -replace "\\$" # Remove potential trailing backslash
 
-    return $instance
-}
-
-Write-Verbose "Executing $($MyInvocation.MyCommand.Name) with DisableVS2017=$DisableVS2017, DisableVS2015=$DisableVS2015"
 $scriptsDir = split-path -parent $MyInvocation.MyCommand.Definition
-
-$validInstances = New-Object System.Collections.ArrayList
-
-# VS2017
-Write-Verbose "`n`n"
-Write-Verbose "Checking for MSBuild from VS2017 instances..."
-$VisualStudio2017InstallationInstances = & $scriptsDir\findVisualStudioInstallationInstances.ps1
-Write-Verbose "VS2017 Candidates: $([system.String]::Join(',', $VisualStudio2017InstallationInstances))"
-foreach ($instanceCandidate in $VisualStudio2017InstallationInstances)
-{
-    $VCFolder= "$instanceCandidate\VC\Tools\MSVC\"
-
-    if (Test-Path $VCFolder)
-    {
-        $instance = New-MSBuildInstance "$instanceCandidate\MSBuild\15.0\Bin\MSBuild.exe" "v141"
-        Write-Verbose "Found $instance"
-        $validInstances.Add($instance) > $null
-    }
-}
-
-# VS2015 - in Program Files
-Write-Verbose "`n`n"
-Write-Verbose "Checking for MSBuild from VS2015 in Program Files..."
-$CandidateProgramFiles = $(& $scriptsDir\getProgramFiles32bit.ps1), $(& $scriptsDir\getProgramFilesPlatformBitness.ps1)
-Write-Verbose "Program Files Candidate locations: $([system.String]::Join(',', $CandidateProgramFiles))"
-foreach ($ProgramFiles in $CandidateProgramFiles)
-{
-    $clExe= "$ProgramFiles\Microsoft Visual Studio 14.0\VC\bin\cl.exe"
-
-    if (!(Test-Path $clExe))
-    {
-        Write-Verbose "$clExe - Not Found"
-        continue
-    }
-
-    Write-Verbose "$clExe - Found"
-    $instance = New-MSBuildInstance "$ProgramFiles\MSBuild\14.0\Bin\MSBuild.exe" "v140"
-    Write-Verbose "Found $instance"
-    $validInstances.Add($instance) > $null
-}
-
-# VS2015 - through the registry
-function NewCppRegistryPair()
-{
-    param ($visualStudioEntry, $msBuildEntry)
-
-    $instance = new-object PSObject
-    $instance | add-member -type NoteProperty -Name visualStudioEntry -Value $visualStudioEntry
-    $instance | add-member -type NoteProperty -Name msBuildEntry -Value $msBuildEntry
-
-    return $instance
-}
-
-Write-Verbose "`n`n"
-Write-Verbose "Checking for MSBuild from VS2015 through the registry..."
-
-$registryPairs =
-$(NewCppRegistryPair "Registry::HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\Microsoft\visualstudio\14.0" "Registry::HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\Microsoft\msbuild\toolsversions\14.0"),
-$(NewCppRegistryPair "Registry::HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\visualstudio\14.0" "Registry::HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\msbuild\toolsversions\14.0")
-
-foreach ($pair in $registryPairs)
+$VisualStudioInstallationInstances = & $scriptsDir\findVisualStudioInstallationInstances.ps1
+Write-Verbose "VS Candidates:`n`r$([system.String]::Join([Environment]::NewLine, $VisualStudioInstallationInstances))"
+foreach ($instanceCandidate in $VisualStudioInstallationInstances)
 {
-    $vsEntry = $pair.visualStudioEntry
-    try
-    {
-        $VS14InstallDir = $(gp $vsEntry InstallDir -erroraction Stop | % { $_.InstallDir })
-        Write-Verbose "$vsEntry\InstallDir - Found"
-    }
-    catch
-    {
-        Write-Verbose "$vsEntry\InstallDir - Not Found"
-        continue
-    }
-
-    Write-Verbose "$VS14InstallDir - Obtained from registry"
-    # We want "${VS14InstallDir}..\..\VC\bin\cl.exe"
-    # Doing Split-path to avoid the ..\.. from appearing in the output
-    $clExePath = Split-path $VS14InstallDir -Parent
-    $clExePath = Split-path $clExePath -Parent
-    $clExePath = "$clExePath\VC\bin\cl.exe"
-
-    if (!(Test-Path $clExePath))
-    {
-        Write-Verbose "$clExePath - Not Found"
-        continue
-    }
+    Write-Verbose "Inspecting: $instanceCandidate"
+    $split = $instanceCandidate -split "::"
+    # $preferenceWeight = $split[0]
+    # $releaseType = $split[1]
+    $version = $split[2]
+    $path = $split[3]
 
-    Write-Verbose "$clExePath - Found"
-
-    $msbuildEntry = $pair.msBuildEntry
-    try
-    {
-        $MSBuild14 = $(gp $msbuildEntry MSBuildToolsPath -erroraction Stop | % { $_.MSBuildToolsPath })
-        Write-Verbose "$msbuildEntry\MSBuildToolsPath - Found"
-    }
-    catch
-    {
-        Write-Verbose "$msbuildEntry\MSBuildToolsPath - Not Found"
-        continue
-    }
-
-    Write-Verbose "${MSBuild14} - Obtained from registry"
-    $msbuildPath = "${MSBuild14}MSBuild.exe"
-    if (!(Test-Path $msbuildPath))
+    if ($explicitlyRequestedVSPath -ne "" -and $explicitlyRequestedVSPath -ne $path)
     {
-        Write-Verbose "$msbuildPath - Not Found"
+        Write-Verbose "Skipping: $instanceCandidate"
         continue
     }
 
-    $instance = New-MSBuildInstance $msbuildPath "v140"
-    Write-Verbose "Found $instance"
-    $validInstances.Add($instance) > $null
-}
-
-Write-Verbose "`n`n`n"
-Write-Verbose "The following MSBuild instances were found:"
-foreach ($instance in $validInstances)
-{
-    Write-Verbose $instance
-}
-
-# Selecting
-foreach ($instance in $validInstances)
-{
-    if (!$DisableVS2017 -and $instance.toolsetVersion -eq "v141")
+    $majorVersion = $version.Substring(0,2);
+    if ($majorVersion -eq "15")
     {
-        return $instance.msbuildExePath, $instance.toolsetVersion
+        $VCFolder= "$path\VC\Tools\MSVC\"
+        if (Test-Path $VCFolder)
+        {
+            Write-Verbose "Picking: $instanceCandidate"
+            return "$path\MSBuild\15.0\Bin\MSBuild.exe", "v141"
+        }
     }
 
-    if (!$DisableVS2015 -and $instance.toolsetVersion -eq "v140")
+    if ($majorVersion -eq "14")
     {
-        return $instance.msbuildExePath, $instance.toolsetVersion
+        $clExe= "$path\VC\bin\cl.exe"
+        if (Test-Path $clExe)
+        {
+            Write-Verbose "Picking: $instanceCandidate"
+            $programFilesPath = split-path -parent $path
+            return "$programFilesPath\MSBuild\14.0\Bin\MSBuild.exe", "v140"
+        }
     }
 }
 
-
 throw "Could not find MSBuild version with C++ support. VS2015 or VS2017 (with C++) needs to be installed."
\ No newline at end of file
diff --git a/scripts/findVisualStudioInstallationInstances.ps1 b/scripts/findVisualStudioInstallationInstances.ps1
index ca807980c..8c67ef6d6 100644
--- a/scripts/findVisualStudioInstallationInstances.ps1
+++ b/scripts/findVisualStudioInstallationInstances.ps1
@@ -4,32 +4,35 @@ param(
 )
 
 $scriptsDir = split-path -parent $MyInvocation.MyCommand.Definition
-$vcpkgRootDir = & $scriptsDir\findFileRecursivelyUp.ps1 $scriptsDir .vcpkg-root
+$vswhereExe = & $scriptsDir\fetchDependency.ps1 "vswhere"
 
-$downloadsDir = "$vcpkgRootDir\downloads"
+$output = & $vswhereExe -prerelease -legacy -format xml
+[xml]$asXml = $output
 
-$nugetexe = & $scriptsDir\fetchDependency.ps1 "nuget"
-$nugetPackageDir = "$downloadsDir\nuget-packages"
-
-$SetupAPIVersion = "1.8.24"
-Write-Verbose "Fetching Microsoft.VisualStudio.Setup.Configuration.Native@$SetupAPIVersion from NuGet."
-$nugetOutput = & $nugetexe install Microsoft.VisualStudio.Setup.Configuration.Native -Version $SetupAPIVersion -OutputDirectory $nugetPackageDir -Source "https://api.nuget.org/v3/index.json" -nocache 2>&1
-Write-Verbose "Fetching Microsoft.VisualStudio.Setup.Configuration.Native@$SetupAPIVersion from NuGet. Done."
-
-$SetupConsoleExe = "$nugetPackageDir\Microsoft.VisualStudio.Setup.Configuration.Native.$SetupAPIVersion\tools\x86\Microsoft.VisualStudio.Setup.Configuration.Console.exe"
-
-if (!(Test-Path $SetupConsoleExe))
+$results = New-Object System.Collections.ArrayList
+foreach ($instance in $asXml.instances.instance)
 {
-    throw $nugetOutput
+    $installationPath = $instance.InstallationPath -replace "\\$" # Remove potential trailing backslash
+    $installationVersion = $instance.InstallationVersion
+    $isPrerelease = $instance.IsPrerelease
+    if ($isPrerelease -eq 0)
+    {
+        $releaseType = "PreferenceWeight3::StableRelease"
+    }
+    elseif ($isPrerelease -eq 1)
+    {
+        $releaseType = "PreferenceWeight2::PreRelease"
+    }
+    else
+    {
+        $releaseType = "PreferenceWeight1::Legacy"
+    }
+
+    # Placed like that for easy sorting according to preference
+    $results.Add("${releaseType}::${installationVersion}::${installationPath}") > $null
 }
 
-$instances = & $SetupConsoleExe -nologo -value InstallationPath 2>&1
-$instanceCount = $instances.Length
-
-# The last item can be empty
-if ($instanceCount -gt 0 -and $instances[$instanceCount - 1] -eq "")
-{
-    $instances = $instances[0..($instanceCount - 2)]
-}
+$results.Sort()
+$results.Reverse()
 
-return $instances
+return $results
\ No newline at end of file
-- 
cgit v1.2.3


From 0643bd6581182a537b23c885b1c6b27e33e61dc4 Mon Sep 17 00:00:00 2001
From: Daniel Strommen <nerdile@outlook.com>
Date: Thu, 5 Oct 2017 19:47:41 -0700
Subject: Fix Win10SDK detection during Bootstrap

When multiple Win10 SDK's are installed, like Insider previews,
depending on the SDK installation, it may not contain the um headers.
There is already a loop for trying to find the newest Win10 SDK
that has full headers, but it's returning at the first failure,
rather than continuing the loop to the next iteration.

Also, use Join-Path instead of manual path appending, to normalize
the extra \ at the end of the sdk root value.  In some cases paths
with double backslashes can be interpreted as a fallback syntax for
UNC paths.  Join-Path normalizes the path appropriately.
---
 scripts/getWindowsSDK.ps1 | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'scripts')

diff --git a/scripts/getWindowsSDK.ps1 b/scripts/getWindowsSDK.ps1
index 9aebae8e3..f4537ddc3 100644
--- a/scripts/getWindowsSDK.ps1
+++ b/scripts/getWindowsSDK.ps1
@@ -20,7 +20,7 @@ $validInstances = New-Object System.Collections.ArrayList
 # Windows 10 SDK
 function CheckWindows10SDK($path)
 {
-    $folder = "$path\Include"
+    $folder = (Join-Path $path "Include")
     if (!(Test-Path $folder))
     {
         Write-Verbose "$folder - Not Found"
@@ -37,7 +37,7 @@ function CheckWindows10SDK($path)
         if (!(Test-Path $windowsheader))
         {
             Write-Verbose "$windowsheader - Not Found"
-            return
+            continue
         }
         Write-Verbose "$windowsheader - Found"
 
@@ -45,7 +45,7 @@ function CheckWindows10SDK($path)
         if (!(Test-Path $ddkheader))
         {
             Write-Verbose "$ddkheader - Not Found"
-            return
+            continue
         }
 
         Write-Verbose "$ddkheader - Found"
@@ -106,4 +106,4 @@ foreach ($instance in $validInstances)
     }
 }
 
-throw "Could not detect a Windows SDK / TargetPlatformVersion"
\ No newline at end of file
+throw "Could not detect a Windows SDK / TargetPlatformVersion"
-- 
cgit v1.2.3


From e3527b23ea291489fae1363528ecde07c9191f95 Mon Sep 17 00:00:00 2001
From: Alexander Karatarakis <alkarata@microsoft.com>
Date: Thu, 5 Oct 2017 22:44:49 -0700
Subject: Don't assume VS2015 is in C:\Program Files (x86)\

---
 scripts/findAnyMSBuildWithCppPlatformToolset.ps1 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'scripts')

diff --git a/scripts/findAnyMSBuildWithCppPlatformToolset.ps1 b/scripts/findAnyMSBuildWithCppPlatformToolset.ps1
index 632cc2cdf..e9fb60cb2 100644
--- a/scripts/findAnyMSBuildWithCppPlatformToolset.ps1
+++ b/scripts/findAnyMSBuildWithCppPlatformToolset.ps1
@@ -41,7 +41,7 @@ foreach ($instanceCandidate in $VisualStudioInstallationInstances)
         if (Test-Path $clExe)
         {
             Write-Verbose "Picking: $instanceCandidate"
-            $programFilesPath = split-path -parent $path
+            $programFilesPath = & $scriptsDir\getProgramFiles32bit.ps1
             return "$programFilesPath\MSBuild\14.0\Bin\MSBuild.exe", "v140"
         }
     }
-- 
cgit v1.2.3


From cf7762a82ea044b33ddadd6b1d01a4035af3bf9d Mon Sep 17 00:00:00 2001
From: Robert Schumacher <roschuma@microsoft.com>
Date: Fri, 6 Oct 2017 00:49:41 -0700
Subject: [vcpkg-internal-ci] Remove chakracore due to dependency on cor.h

---
 scripts/internalCI.ps1 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'scripts')

diff --git a/scripts/internalCI.ps1 b/scripts/internalCI.ps1
index 67871acc1..887eb7bea 100644
--- a/scripts/internalCI.ps1
+++ b/scripts/internalCI.ps1
@@ -14,7 +14,7 @@ if (-not $?) { throw $? }
 ./vcpkg.exe install azure-storage-cpp cpprestsdk:x64-windows-static cpprestsdk:x86-uwp
 if (-not $?) { throw $? }
 
-./vcpkg.exe install bond chakracore cryptopp zlib expat sdl2 curl sqlite3 libuv protobuf:x64-windows sfml opencv:x64-windows uwebsockets uwebsockets:x64-windows-static
+./vcpkg.exe install bond cryptopp zlib expat sdl2 curl sqlite3 libuv protobuf:x64-windows sfml opencv:x64-windows uwebsockets uwebsockets:x64-windows-static
 if (-not $?) { throw $? }
 
 ./vcpkg.exe install opencv:x86-uwp boost:x86-uwp
-- 
cgit v1.2.3


From f0f25b1cb714e07766b998bb205314498f891416 Mon Sep 17 00:00:00 2001
From: Alexander Karatarakis <alkarata@microsoft.com>
Date: Fri, 6 Oct 2017 02:04:04 -0700
Subject: Remove unused variable

---
 scripts/getWindowsSDK.ps1 | 1 -
 1 file changed, 1 deletion(-)

(limited to 'scripts')

diff --git a/scripts/getWindowsSDK.ps1 b/scripts/getWindowsSDK.ps1
index f4537ddc3..8ef26a436 100644
--- a/scripts/getWindowsSDK.ps1
+++ b/scripts/getWindowsSDK.ps1
@@ -13,7 +13,6 @@ if ($DisableWin10SDK -and $DisableWin81SDK)
 }
 
 Write-Verbose "Executing $($MyInvocation.MyCommand.Name)"
-$scriptsDir = split-path -parent $MyInvocation.MyCommand.Definition
 
 $validInstances = New-Object System.Collections.ArrayList
 
-- 
cgit v1.2.3


From cd4142d3cac144c6f4e558cdfe8403e1987ff833 Mon Sep 17 00:00:00 2001
From: Alexander Karatarakis <alkarata@microsoft.com>
Date: Fri, 6 Oct 2017 14:06:02 -0700
Subject: Bump version of nuget to 4.3.0 (was 4.1.0)

---
 scripts/fetchDependency.ps1 | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'scripts')

diff --git a/scripts/fetchDependency.ps1 b/scripts/fetchDependency.ps1
index 80d6d2abb..665376baf 100644
--- a/scripts/fetchDependency.ps1
+++ b/scripts/fetchDependency.ps1
@@ -116,11 +116,11 @@ function SelectProgram([Parameter(Mandatory=$true)][string]$Dependency)
     }
     elseif($Dependency -eq "nuget")
     {
-        $requiredVersion = "4.1.0"
-        $downloadVersion = "4.1.0"
-        $url = "https://dist.nuget.org/win-x86-commandline/v4.1.0/nuget.exe"
+        $requiredVersion = "4.3.0"
+        $downloadVersion = "4.3.0"
+        $url = "https://dist.nuget.org/win-x86-commandline/v4.3.0/nuget.exe"
         $downloadPath = "$downloadsDir\nuget-$downloadVersion\nuget.exe"
-        $expectedDownloadedFileHash = "4c1de9b026e0c4ab087302ff75240885742c0faa62bd2554f913bbe1f6cb63a0"
+        $expectedDownloadedFileHash = "386da77a8cf2b63d1260b7020feeedabfe3b65ab31d20e6a313a530865972f3a"
         $executableFromDownload = $downloadPath
         $extractionType = $ExtractionType_NO_EXTRACTION_REQUIRED
     }
-- 
cgit v1.2.3


From ab7a1abc93473dc1b7fcb341a4d104e3a77afd87 Mon Sep 17 00:00:00 2001
From: Alexander Karatarakis <alkarata@microsoft.com>
Date: Mon, 9 Oct 2017 16:38:21 -0700
Subject: [VS detection] Add -products * flag to vswhere. This includes Express
 and BuildTools SKUs

---
 scripts/findVisualStudioInstallationInstances.ps1 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'scripts')

diff --git a/scripts/findVisualStudioInstallationInstances.ps1 b/scripts/findVisualStudioInstallationInstances.ps1
index 8c67ef6d6..b2f186478 100644
--- a/scripts/findVisualStudioInstallationInstances.ps1
+++ b/scripts/findVisualStudioInstallationInstances.ps1
@@ -6,7 +6,7 @@ param(
 $scriptsDir = split-path -parent $MyInvocation.MyCommand.Definition
 $vswhereExe = & $scriptsDir\fetchDependency.ps1 "vswhere"
 
-$output = & $vswhereExe -prerelease -legacy -format xml
+$output = & $vswhereExe -prerelease -legacy -products * -format xml
 [xml]$asXml = $output
 
 $results = New-Object System.Collections.ArrayList
-- 
cgit v1.2.3


From b6512bace19d6c28cce71a0c2e8e28ab77d3ef56 Mon Sep 17 00:00:00 2001
From: Alexander Karatarakis <alkarata@microsoft.com>
Date: Mon, 9 Oct 2017 16:40:13 -0700
Subject: [vswhere.exe] Update to vesrion 2.2.3 (was 2.1.4)

---
 scripts/fetchDependency.ps1 | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'scripts')

diff --git a/scripts/fetchDependency.ps1 b/scripts/fetchDependency.ps1
index 665376baf..bc58f4436 100644
--- a/scripts/fetchDependency.ps1
+++ b/scripts/fetchDependency.ps1
@@ -126,11 +126,11 @@ function SelectProgram([Parameter(Mandatory=$true)][string]$Dependency)
     }
     elseif($Dependency -eq "vswhere")
     {
-        $requiredVersion = "2.1.4"
-        $downloadVersion = "2.1.4"
-        $url = "https://github.com/Microsoft/vswhere/releases/download/2.1.4/vswhere.exe"
+        $requiredVersion = "2.2.3"
+        $downloadVersion = "2.2.3"
+        $url = "https://github.com/Microsoft/vswhere/releases/download/2.2.3/vswhere.exe"
         $downloadPath = "$downloadsDir\vswhere-$downloadVersion\vswhere.exe"
-        $expectedDownloadedFileHash = "548fb9dfeed59bc4ddcce739a5729e9c8dd5932cd60ff6f74727ee069e7da458"
+        $expectedDownloadedFileHash = "5f19066ac91635ad17d33fe0f79fc63c672a46f98c0358589a90163bcb2733e8"
         $executableFromDownload = $downloadPath
         $extractionType = $ExtractionType_NO_EXTRACTION_REQUIRED
     }
-- 
cgit v1.2.3


From 00d89dbd66a658174233920d6be2a85f282ef29f Mon Sep 17 00:00:00 2001
From: Mikhail Paulyshka <me@mixaill.tk>
Date: Sun, 24 Sep 2017 16:01:37 +0300
Subject: vcpkg: initial ARM64 support

---
 scripts/cmake/vcpkg_configure_cmake.cmake | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

(limited to 'scripts')

diff --git a/scripts/cmake/vcpkg_configure_cmake.cmake b/scripts/cmake/vcpkg_configure_cmake.cmake
index fe8c97c52..bfb6a19fd 100644
--- a/scripts/cmake/vcpkg_configure_cmake.cmake
+++ b/scripts/cmake/vcpkg_configure_cmake.cmake
@@ -78,14 +78,20 @@ function(vcpkg_configure_cmake)
         set(GENERATOR "Visual Studio 15 2017")
     elseif(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore" AND TRIPLET_SYSTEM_ARCH MATCHES "x64" AND VCPKG_PLATFORM_TOOLSET MATCHES "v141")
         set(GENERATOR "Visual Studio 15 2017 Win64")
-    elseif(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore" AND TRIPLET_SYSTEM_ARCH MATCHES "arm" AND VCPKG_PLATFORM_TOOLSET MATCHES "v141")
+    elseif(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore" AND TRIPLET_SYSTEM_ARCH STREQUAL "arm" AND VCPKG_PLATFORM_TOOLSET MATCHES "v141")
         set(GENERATOR "Visual Studio 15 2017 ARM")
+    elseif(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore" AND TRIPLET_SYSTEM_ARCH STREQUAL "arm64" AND VCPKG_PLATFORM_TOOLSET MATCHES "v141")
+        set(GENERATOR "Visual Studio 15 2017")    
+        set(ARCH "ARM64")
     elseif(TRIPLET_SYSTEM_ARCH MATCHES "x86" AND VCPKG_PLATFORM_TOOLSET MATCHES "v141")
         set(GENERATOR "Visual Studio 15 2017")
     elseif(TRIPLET_SYSTEM_ARCH MATCHES "x64" AND VCPKG_PLATFORM_TOOLSET MATCHES "v141")
         set(GENERATOR "Visual Studio 15 2017 Win64")
-    elseif(TRIPLET_SYSTEM_ARCH MATCHES "arm" AND VCPKG_PLATFORM_TOOLSET MATCHES "v141")
+    elseif(TRIPLET_SYSTEM_ARCH STREQUAL "arm" AND VCPKG_PLATFORM_TOOLSET MATCHES "v141")
         set(GENERATOR "Visual Studio 15 2017 ARM")
+    elseif(TRIPLET_SYSTEM_ARCH STREQUAL "arm64" AND VCPKG_PLATFORM_TOOLSET MATCHES "v141")
+        set(GENERATOR "Visual Studio 15 2017")
+        set(ARCH "ARM64")
     endif()
     
     # If we use Ninja, make sure it's on PATH
@@ -139,6 +145,12 @@ function(vcpkg_configure_cmake)
         "-DCMAKE_ERROR_ON_ABSOLUTE_INSTALL_DESTINATION=ON"
     )
 
+    if(DEFINED ARCH)
+        list(APPEND _csc_OPTIONS
+            "-A${ARCH}"
+        )
+    endif()
+
     if(DEFINED VCPKG_CRT_LINKAGE AND VCPKG_CRT_LINKAGE STREQUAL dynamic)
         list(APPEND _csc_OPTIONS_DEBUG
             "-DCMAKE_CXX_FLAGS_DEBUG=/D_DEBUG /MDd /Z7 /Ob0 /Od /RTC1 ${VCPKG_CXX_FLAGS_DEBUG}"
-- 
cgit v1.2.3


From 5c66f301b9d7aa27a11059cee970e579f039c66c Mon Sep 17 00:00:00 2001
From: Robert Schumacher <roschuma@microsoft.com>
Date: Thu, 12 Oct 2017 08:22:50 -0700
Subject: [vcpkg-scripts] Remove double expansions

---
 scripts/cmake/vcpkg_acquire_depot_tools.cmake  |  2 +-
 scripts/cmake/vcpkg_download_distfile.cmake    |  2 +-
 scripts/cmake/vcpkg_find_acquire_program.cmake | 11 +++++++----
 3 files changed, 9 insertions(+), 6 deletions(-)

(limited to 'scripts')

diff --git a/scripts/cmake/vcpkg_acquire_depot_tools.cmake b/scripts/cmake/vcpkg_acquire_depot_tools.cmake
index 1cc375725..009ba40f1 100644
--- a/scripts/cmake/vcpkg_acquire_depot_tools.cmake
+++ b/scripts/cmake/vcpkg_acquire_depot_tools.cmake
@@ -26,7 +26,7 @@ function(vcpkg_acquire_depot_tools PATH_TO_ROOT_OUT)
         set(download_success 1)
       endif()
 
-      if (NOT ${download_success})
+      if (NOT download_success)
         message(FATAL_ERROR
           "\n"
           "    Failed to download file.\n"
diff --git a/scripts/cmake/vcpkg_download_distfile.cmake b/scripts/cmake/vcpkg_download_distfile.cmake
index 006570195..b8acfc823 100644
--- a/scripts/cmake/vcpkg_download_distfile.cmake
+++ b/scripts/cmake/vcpkg_download_distfile.cmake
@@ -78,7 +78,7 @@ function(vcpkg_download_distfile VAR)
             endif()
         endforeach(url)
 
-        if (NOT ${download_success})
+        if (NOT download_success)
             message(FATAL_ERROR
             "\n"
             "    Failed to download file.\n"
diff --git a/scripts/cmake/vcpkg_find_acquire_program.cmake b/scripts/cmake/vcpkg_find_acquire_program.cmake
index 3c6dfae08..8d167e1c2 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()
 
@@ -153,7 +154,8 @@ function(vcpkg_find_acquire_program VAR)
 
   macro(do_find)
     if(NOT DEFINED REQUIRED_INTERPRETER)
-      find_program(${VAR} ${PROGNAME} PATHS ${PATHS})
+      find_program(FOUND_PROG ${PROGNAME} PATHS ${PATHS})
+      set(${VAR} ${FOUND_PROG})
     else()
       vcpkg_find_acquire_program(${REQUIRED_INTERPRETER})
       find_file(SCRIPT ${SCRIPTNAME} PATHS ${PATHS})
@@ -162,7 +164,8 @@ function(vcpkg_find_acquire_program VAR)
   endmacro()
 
   do_find()
-  if(${VAR} MATCHES "-NOTFOUND")
+  set(FOUND_PROG ${${VAR}})
+  if(FOUND_PROG MATCHES "-NOTFOUND")
     file(DOWNLOAD ${URL} ${DOWNLOADS}/${ARCHIVE}
       EXPECTED_HASH SHA512=${HASH}
       SHOW_PROGRESS
@@ -173,7 +176,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(
-- 
cgit v1.2.3


From 9ddc98988fb8d7c886963fa7568395ecd5785eaa Mon Sep 17 00:00:00 2001
From: Robert Schumacher <roschuma@microsoft.com>
Date: Thu, 12 Oct 2017 10:52:00 -0700
Subject: [vcpkg-scripts] Detect and prompt for proxy in more cases

---
 scripts/bootstrap.ps1       |  4 ----
 scripts/fetchDependency.ps1 | 20 +++++++++++---------
 2 files changed, 11 insertions(+), 13 deletions(-)

(limited to 'scripts')

diff --git a/scripts/bootstrap.ps1 b/scripts/bootstrap.ps1
index fa51de404..b7bc5afab 100644
--- a/scripts/bootstrap.ps1
+++ b/scripts/bootstrap.ps1
@@ -4,10 +4,6 @@ param(
     [string]$disableMetrics = "0"
 )
 
-$webclient=New-Object System.Net.WebClient
-$creds=Get-Credential
-$webclient.Proxy.Credentials=$creds
-
 $scriptsDir = split-path -parent $MyInvocation.MyCommand.Definition
 $vcpkgRootDir = & $scriptsDir\findFileRecursivelyUp.ps1 $scriptsDir .vcpkg-root
 
diff --git a/scripts/fetchDependency.ps1 b/scripts/fetchDependency.ps1
index b6144d581..2ee87bcff 100644
--- a/scripts/fetchDependency.ps1
+++ b/scripts/fetchDependency.ps1
@@ -82,17 +82,19 @@ function SelectProgram([Parameter(Mandatory=$true)][string]$Dependency)
             New-Item -ItemType directory -Path $downloadDir | Out-Null
         }
 
+        $WC = New-Object System.Net.WebClient
+        $ProxyAuth = !$WC.Proxy.IsBypassed($url)
+        if ($ProxyAuth)
+        {
+            $ProxyCred = Get-Credential -Message "Enter credentials for Proxy Authentication"
+            $PSDefaultParameterValues.Add("Start-BitsTransfer:ProxyAuthentication","Basic")
+            $PSDefaultParameterValues.Add("Start-BitsTransfer:ProxyCredential",$ProxyCred)
+            $WC.Proxy.Credentials=$ProxyCred
+        }
+
         if (($PSVersionTable.PSEdition -ne "Core") -and ($Dependency -ne "git")) # git fails with BITS
         {
             try {
-                $WC = New-Object System.Net.WebClient
-                $ProxyAuth = !$WC.Proxy.IsBypassed($url)
-                If($ProxyAuth){
-                    $ProxyCred = Get-Credential -Message "Enter credentials for Proxy Authentication"
-                    $PSDefaultParameterValues.Add("Start-BitsTransfer:ProxyAuthentication","Basic")
-                    $PSDefaultParameterValues.Add("Start-BitsTransfer:ProxyCredential",$ProxyCred)
-                }
-
                 Start-BitsTransfer -Source $url -Destination $downloadPath -ErrorAction Stop
             }
             catch [System.Exception] {
@@ -106,7 +108,7 @@ function SelectProgram([Parameter(Mandatory=$true)][string]$Dependency)
         if (!(Test-Path $downloadPath))
         {
             Write-Verbose("Downloading $Dependency...")
-            (New-Object System.Net.WebClient).DownloadFile($url, $downloadPath)
+            $WC.DownloadFile($url, $downloadPath)
         }
     }
 
-- 
cgit v1.2.3


From 53ad1402514481c581a7b3bd1b0ffbcea9aaa902 Mon Sep 17 00:00:00 2001
From: Robert Schumacher <roschuma@microsoft.com>
Date: Thu, 12 Oct 2017 11:54:47 -0700
Subject: [vcpkg-scripts] Hotpatch revert changes to
 vcpkg_find_acquire_program.cmake.

---
 scripts/cmake/vcpkg_find_acquire_program.cmake | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

(limited to 'scripts')

diff --git a/scripts/cmake/vcpkg_find_acquire_program.cmake b/scripts/cmake/vcpkg_find_acquire_program.cmake
index 8d167e1c2..51e394bf1 100644
--- a/scripts/cmake/vcpkg_find_acquire_program.cmake
+++ b/scripts/cmake/vcpkg_find_acquire_program.cmake
@@ -154,8 +154,7 @@ function(vcpkg_find_acquire_program VAR)
 
   macro(do_find)
     if(NOT DEFINED REQUIRED_INTERPRETER)
-      find_program(FOUND_PROG ${PROGNAME} PATHS ${PATHS})
-      set(${VAR} ${FOUND_PROG})
+      find_program(${VAR} ${PROGNAME} PATHS ${PATHS})
     else()
       vcpkg_find_acquire_program(${REQUIRED_INTERPRETER})
       find_file(SCRIPT ${SCRIPTNAME} PATHS ${PATHS})
@@ -164,8 +163,7 @@ function(vcpkg_find_acquire_program VAR)
   endmacro()
 
   do_find()
-  set(FOUND_PROG ${${VAR}})
-  if(FOUND_PROG MATCHES "-NOTFOUND")
+  if("${${VAR}}" MATCHES "-NOTFOUND")
     file(DOWNLOAD ${URL} ${DOWNLOADS}/${ARCHIVE}
       EXPECTED_HASH SHA512=${HASH}
       SHOW_PROGRESS
@@ -194,5 +192,5 @@ function(vcpkg_find_acquire_program VAR)
     do_find()
   endif()
 
-  set(${VAR} ${${VAR}} PARENT_SCOPE)
+  set(${VAR} "${${VAR}}" PARENT_SCOPE)
 endfunction()
-- 
cgit v1.2.3


From fc1a24ad8bb3187d17341c967353c3cc9742317a Mon Sep 17 00:00:00 2001
From: Robert Schumacher <roschuma@microsoft.com>
Date: Sat, 14 Oct 2017 01:45:28 -0700
Subject: [vcpkg] Initial commit of powershell integration

---
 scripts/posh-vcpkg/0.0.1/posh-vcpkg.psd1 | 31 +++++++++++++++++++++++++
 scripts/posh-vcpkg/0.0.1/posh-vcpkg.psm1 | 39 ++++++++++++++++++++++++++++++++
 2 files changed, 70 insertions(+)
 create mode 100644 scripts/posh-vcpkg/0.0.1/posh-vcpkg.psd1
 create mode 100644 scripts/posh-vcpkg/0.0.1/posh-vcpkg.psm1

(limited to 'scripts')

diff --git a/scripts/posh-vcpkg/0.0.1/posh-vcpkg.psd1 b/scripts/posh-vcpkg/0.0.1/posh-vcpkg.psd1
new file mode 100644
index 000000000..3fb94fe7d
--- /dev/null
+++ b/scripts/posh-vcpkg/0.0.1/posh-vcpkg.psd1
@@ -0,0 +1,31 @@
+@{
+
+# Script module or binary module file associated with this manifest.
+ModuleToProcess = 'posh-vcpkg.psm1'
+
+# Version number of this module.
+ModuleVersion = '0.0.1'
+
+# ID used to uniquely identify this module
+GUID = '948f02ab-fc99-4a53-8335-b6556eef129b'
+
+# Minimum version of the Windows PowerShell engine required by this module
+PowerShellVersion = '5.0'
+
+FunctionsToExport = @('TabExpansion')
+CmdletsToExport = @()
+VariablesToExport = @()
+AliasesToExport = @()
+
+# Private data to pass to the module specified in RootModule/ModuleToProcess.
+# This may also contain a PSData hashtable with additional module metadata used by PowerShell.
+PrivateData = 
+@{
+    PSData =
+    @{
+        # Tags applied to this module. These help with module discovery in online galleries.
+        Tags = @('vcpkg', 'tab', 'tab-completion', 'tab-expansion', 'tabexpansion')
+    }
+}
+
+}
diff --git a/scripts/posh-vcpkg/0.0.1/posh-vcpkg.psm1 b/scripts/posh-vcpkg/0.0.1/posh-vcpkg.psm1
new file mode 100644
index 000000000..25ef99609
--- /dev/null
+++ b/scripts/posh-vcpkg/0.0.1/posh-vcpkg.psm1
@@ -0,0 +1,39 @@
+param()
+
+if (Get-Module posh-vcpkg) { return }
+
+if ($PSVersionTable.PSVersion.Major -lt 5) {
+    Write-Warning ("posh-vcpkg does not support PowerShell versions before 5.0.")
+    return
+}
+
+if (Test-Path Function:\TabExpansion) {
+    Rename-Item Function:\TabExpansion VcpkgTabExpansionBackup
+}
+
+function TabExpansion($line, $lastWord) {
+    $lastBlock = [regex]::Split($line, '[|;]')[-1].TrimStart()
+
+    switch -regex ($lastBlock) {
+        "^(?<vcpkgexe>(\./|\.\\|)vcpkg(\.exe|)) (?<remaining>.*)$"
+        {
+            & $matches['vcpkgexe'] autocomplete $matches['remaining']
+            return
+        }
+
+        # Fall back on existing tab expansion
+        default {
+            if (Test-Path Function:\VcpkgTabExpansionBackup) {
+                VcpkgTabExpansionBackup $line $lastWord
+            }
+        }
+    }
+}
+
+$exportModuleMemberParams = @{
+    Function = @(
+        'TabExpansion'
+    )
+}
+
+Export-ModuleMember @exportModuleMemberParams
-- 
cgit v1.2.3


From 81613fa0ff506852fbb90757fc27f87ffe591fee Mon Sep 17 00:00:00 2001
From: Robert Schumacher <roschuma@microsoft.com>
Date: Mon, 16 Oct 2017 11:22:21 -0700
Subject: [vcpkg-toolchain] Improvements; add VCPKG_CHAINLOAD_TOOLCHAIN_FILE

---
 scripts/buildsystems/vcpkg.cmake          | 267 ++++++++++++++++--------------
 scripts/cmake/vcpkg_configure_cmake.cmake | 106 +++++++-----
 2 files changed, 203 insertions(+), 170 deletions(-)

(limited to 'scripts')

diff --git a/scripts/buildsystems/vcpkg.cmake b/scripts/buildsystems/vcpkg.cmake
index d8c7ee6b8..19fc99af7 100644
--- a/scripts/buildsystems/vcpkg.cmake
+++ b/scripts/buildsystems/vcpkg.cmake
@@ -1,156 +1,175 @@
 # Mark variables as used so cmake doesn't complain about them
-set(CMAKE_TOOLCHAIN_FILE ${CMAKE_TOOLCHAIN_FILE})
-if(NOT VCPKG_TOOLCHAIN)
-    if(CMAKE_GENERATOR_PLATFORM MATCHES "^[Ww][Ii][Nn]32$")
+mark_as_advanced(CMAKE_TOOLCHAIN_FILE)
+
+if(VCPKG_CHAINLOAD_TOOLCHAIN_FILE)
+    include("${VCPKG_CHAINLOAD_TOOLCHAIN_FILE}")
+endif()
+
+if(VCPKG_TOOLCHAIN)
+    return()
+endif()
+
+get_property( _CMAKE_IN_TRY_COMPILE GLOBAL PROPERTY IN_TRY_COMPILE )
+if( _CMAKE_IN_TRY_COMPILE )
+    include( "${CMAKE_CURRENT_SOURCE_DIR}/../vcpkg.config.cmake" OPTIONAL )
+endif()
+
+if(VCPKG_TARGET_TRIPLET)
+elseif(CMAKE_GENERATOR_PLATFORM MATCHES "^[Ww][Ii][Nn]32$")
+    set(_VCPKG_TARGET_TRIPLET_ARCH x86)
+elseif(CMAKE_GENERATOR_PLATFORM MATCHES "^[Xx]64$")
+    set(_VCPKG_TARGET_TRIPLET_ARCH x64)
+elseif(CMAKE_GENERATOR_PLATFORM MATCHES "^[Aa][Rr][Mm]$")
+    set(_VCPKG_TARGET_TRIPLET_ARCH arm)
+else()
+    if(CMAKE_GENERATOR MATCHES "^Visual Studio 14 2015 Win64$")
+        set(_VCPKG_TARGET_TRIPLET_ARCH x64)
+    elseif(CMAKE_GENERATOR MATCHES "^Visual Studio 14 2015 ARM$")
+        set(_VCPKG_TARGET_TRIPLET_ARCH arm)
+    elseif(CMAKE_GENERATOR MATCHES "^Visual Studio 14 2015$")
         set(_VCPKG_TARGET_TRIPLET_ARCH x86)
-    elseif(CMAKE_GENERATOR_PLATFORM MATCHES "^[Xx]64$")
+    elseif(CMAKE_GENERATOR MATCHES "^Visual Studio 15 2017 Win64$")
         set(_VCPKG_TARGET_TRIPLET_ARCH x64)
-    elseif(CMAKE_GENERATOR_PLATFORM MATCHES "^[Aa][Rr][Mm]$")
+    elseif(CMAKE_GENERATOR MATCHES "^Visual Studio 15 2017 ARM")
         set(_VCPKG_TARGET_TRIPLET_ARCH arm)
+    elseif(CMAKE_GENERATOR MATCHES "^Visual Studio 15 2017")
+        set(_VCPKG_TARGET_TRIPLET_ARCH x86)
     else()
-        if(CMAKE_GENERATOR MATCHES "^Visual Studio 14 2015 Win64$")
+        find_program(_VCPKG_CL cl)
+        if(_VCPKG_CL MATCHES "amd64/cl.exe$" OR _VCPKG_CL MATCHES "x64/cl.exe$")
             set(_VCPKG_TARGET_TRIPLET_ARCH x64)
-        elseif(CMAKE_GENERATOR MATCHES "^Visual Studio 14 2015 ARM$")
+        elseif(_VCPKG_CL MATCHES "arm/cl.exe$")
             set(_VCPKG_TARGET_TRIPLET_ARCH arm)
-        elseif(CMAKE_GENERATOR MATCHES "^Visual Studio 14 2015$")
-            set(_VCPKG_TARGET_TRIPLET_ARCH x86)
-        elseif(CMAKE_GENERATOR MATCHES "^Visual Studio 15 2017 Win64$")
-            set(_VCPKG_TARGET_TRIPLET_ARCH x64)
-        elseif(CMAKE_GENERATOR MATCHES "^Visual Studio 15 2017 ARM")
-            set(_VCPKG_TARGET_TRIPLET_ARCH arm)
-        elseif(CMAKE_GENERATOR MATCHES "^Visual Studio 15 2017")
+        elseif(_VCPKG_CL MATCHES "bin/cl.exe$" OR _VCPKG_CL MATCHES "x86/cl.exe$")
             set(_VCPKG_TARGET_TRIPLET_ARCH x86)
         else()
-            find_program(_VCPKG_CL cl)
-            if(_VCPKG_CL MATCHES "amd64/cl.exe$" OR _VCPKG_CL MATCHES "x64/cl.exe$")
-                set(_VCPKG_TARGET_TRIPLET_ARCH x64)
-            elseif(_VCPKG_CL MATCHES "arm/cl.exe$")
-                set(_VCPKG_TARGET_TRIPLET_ARCH arm)
-            elseif(_VCPKG_CL MATCHES "bin/cl.exe$" OR _VCPKG_CL MATCHES "x86/cl.exe$")
-                set(_VCPKG_TARGET_TRIPLET_ARCH x86)
-            else()
-                message(FATAL_ERROR "Unable to determine target architecture.")
-            endif()
+            message(FATAL_ERROR "Unable to determine target architecture.")
         endif()
     endif()
+endif()
 
-    if(CMAKE_SYSTEM_NAME STREQUAL "WindowsStore" OR CMAKE_SYSTEM_NAME STREQUAL "WindowsPhone")
-        set(_VCPKG_TARGET_TRIPLET_PLAT uwp)
-    else()
-        set(_VCPKG_TARGET_TRIPLET_PLAT windows)
-    endif()
+if(CMAKE_SYSTEM_NAME STREQUAL "WindowsStore" OR CMAKE_SYSTEM_NAME STREQUAL "WindowsPhone")
+    set(_VCPKG_TARGET_TRIPLET_PLAT uwp)
+else()
+    set(_VCPKG_TARGET_TRIPLET_PLAT windows)
+endif()
 
-    set(VCPKG_TARGET_TRIPLET ${_VCPKG_TARGET_TRIPLET_ARCH}-${_VCPKG_TARGET_TRIPLET_PLAT} CACHE STRING "Vcpkg target triplet (ex. x86-windows)")
-    set(_VCPKG_TOOLCHAIN_DIR ${CMAKE_CURRENT_LIST_DIR})
+set(VCPKG_TARGET_TRIPLET ${_VCPKG_TARGET_TRIPLET_ARCH}-${_VCPKG_TARGET_TRIPLET_PLAT} CACHE STRING "Vcpkg target triplet (ex. x86-windows)")
+set(_VCPKG_TOOLCHAIN_DIR ${CMAKE_CURRENT_LIST_DIR})
 
-    #Detect .vcpkg-root to figure VCPKG_ROOT_DIR
-    SET(_VCPKG_ROOT_DIR_CANDIDATE ${CMAKE_CURRENT_LIST_DIR})
-    while(IS_DIRECTORY ${_VCPKG_ROOT_DIR_CANDIDATE} AND NOT EXISTS "${_VCPKG_ROOT_DIR_CANDIDATE}/.vcpkg-root")
-        get_filename_component(_VCPKG_ROOT_DIR_TEMP ${_VCPKG_ROOT_DIR_CANDIDATE} DIRECTORY)
-        if (_VCPKG_ROOT_DIR_TEMP STREQUAL _VCPKG_ROOT_DIR_CANDIDATE) # If unchanged, we have reached the root of the drive
-            message(FATAL_ERROR "Could not find .vcpkg-root")
-        else()
-            SET(_VCPKG_ROOT_DIR_CANDIDATE ${_VCPKG_ROOT_DIR_TEMP})
-        endif()
-    endwhile()
-    set(_VCPKG_ROOT_DIR ${_VCPKG_ROOT_DIR_CANDIDATE})
-    set(_VCPKG_INSTALLED_DIR ${_VCPKG_ROOT_DIR}/installed)
-
-    if(CMAKE_BUILD_TYPE MATCHES "^Debug$" OR NOT DEFINED CMAKE_BUILD_TYPE)
-        list(APPEND CMAKE_PREFIX_PATH
-            ${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/debug
-        )
-        list(APPEND CMAKE_LIBRARY_PATH
-            ${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/debug/lib/manual-link
-        )
+# Detect .vcpkg-root to figure VCPKG_ROOT_DIR
+set(_VCPKG_ROOT_DIR_CANDIDATE ${CMAKE_CURRENT_LIST_DIR})
+while(IS_DIRECTORY ${_VCPKG_ROOT_DIR_CANDIDATE} AND NOT EXISTS "${_VCPKG_ROOT_DIR_CANDIDATE}/.vcpkg-root")
+    get_filename_component(_VCPKG_ROOT_DIR_TEMP ${_VCPKG_ROOT_DIR_CANDIDATE} DIRECTORY)
+    if (_VCPKG_ROOT_DIR_TEMP STREQUAL _VCPKG_ROOT_DIR_CANDIDATE) # If unchanged, we have reached the root of the drive
+        message(FATAL_ERROR "Could not find .vcpkg-root")
+    else()
+        SET(_VCPKG_ROOT_DIR_CANDIDATE ${_VCPKG_ROOT_DIR_TEMP})
     endif()
+endwhile()
+set(_VCPKG_ROOT_DIR ${_VCPKG_ROOT_DIR_CANDIDATE})
+set(_VCPKG_INSTALLED_DIR ${_VCPKG_ROOT_DIR}/installed)
+
+if(CMAKE_BUILD_TYPE MATCHES "^Debug$" OR NOT DEFINED CMAKE_BUILD_TYPE)
     list(APPEND CMAKE_PREFIX_PATH
-        ${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}
+        ${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/debug
     )
     list(APPEND CMAKE_LIBRARY_PATH
-        ${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/lib/manual-link
+        ${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/debug/lib/manual-link
     )
+endif()
+list(APPEND CMAKE_PREFIX_PATH
+    ${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}
+)
+list(APPEND CMAKE_LIBRARY_PATH
+    ${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/lib/manual-link
+)
 
-    set(Boost_COMPILER "-vc140")
+set(Boost_COMPILER "-vc140")
 
-    if (NOT DEFINED CMAKE_SYSTEM_VERSION)
-        include(${_VCPKG_ROOT_DIR}/scripts/cmake/vcpkg_get_windows_sdk.cmake)
-        # This is used as an implicit parameter for vcpkg_get_windows_sdk
-        set(VCPKG_ROOT_DIR ${_VCPKG_ROOT_DIR})
-        vcpkg_get_windows_sdk(WINDOWS_SDK_VERSION)
-        unset(VCPKG_ROOT_DIR)
-        set(CMAKE_SYSTEM_VERSION ${WINDOWS_SDK_VERSION})
-    endif()
+if (NOT DEFINED CMAKE_SYSTEM_VERSION)
+    include(${_VCPKG_ROOT_DIR}/scripts/cmake/vcpkg_get_windows_sdk.cmake)
+    # This is used as an implicit parameter for vcpkg_get_windows_sdk
+    set(VCPKG_ROOT_DIR ${_VCPKG_ROOT_DIR})
+    vcpkg_get_windows_sdk(WINDOWS_SDK_VERSION)
+    unset(VCPKG_ROOT_DIR)
+    set(CMAKE_SYSTEM_VERSION ${WINDOWS_SDK_VERSION} CACHE STRING "Windows SDK version")
+endif()
 
-    file(TO_CMAKE_PATH "$ENV{PROGRAMFILES}" _programfiles)
-    set(CMAKE_SYSTEM_IGNORE_PATH
-        "${_programfiles}/OpenSSL"
-        "${_programfiles}/OpenSSL-Win32"
-        "${_programfiles}/OpenSSL-Win64"
-        "${_programfiles}/OpenSSL-Win32/lib/VC"
-        "${_programfiles}/OpenSSL-Win64/lib/VC"
-        "${_programfiles}/OpenSSL-Win32/lib/VC/static"
-        "${_programfiles}/OpenSSL-Win64/lib/VC/static"
-        "C:/OpenSSL/"
-        "C:/OpenSSL-Win32/"
-        "C:/OpenSSL-Win64/"
-        "C:/OpenSSL-Win32/lib/VC"
-        "C:/OpenSSL-Win64/lib/VC"
-        "C:/OpenSSL-Win32/lib/VC/static"
-        "C:/OpenSSL-Win64/lib/VC/static"
-    )
+file(TO_CMAKE_PATH "$ENV{PROGRAMFILES}" _programfiles)
+set(CMAKE_SYSTEM_IGNORE_PATH
+    "${_programfiles}/OpenSSL"
+    "${_programfiles}/OpenSSL-Win32"
+    "${_programfiles}/OpenSSL-Win64"
+    "${_programfiles}/OpenSSL-Win32/lib/VC"
+    "${_programfiles}/OpenSSL-Win64/lib/VC"
+    "${_programfiles}/OpenSSL-Win32/lib/VC/static"
+    "${_programfiles}/OpenSSL-Win64/lib/VC/static"
+    "C:/OpenSSL/"
+    "C:/OpenSSL-Win32/"
+    "C:/OpenSSL-Win64/"
+    "C:/OpenSSL-Win32/lib/VC"
+    "C:/OpenSSL-Win64/lib/VC"
+    "C:/OpenSSL-Win32/lib/VC/static"
+    "C:/OpenSSL-Win64/lib/VC/static"
+)
 
-    set(CMAKE_PROGRAM_PATH ${CMAKE_PROGRAM_PATH} ${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/tools)
-    file(GLOB _VCPKG_TOOLS_DIRS ${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/tools/*)
-    foreach(_VCPKG_TOOLS_DIR ${_VCPKG_TOOLS_DIRS})
-        if(IS_DIRECTORY ${_VCPKG_TOOLS_DIR})
-            set(CMAKE_PROGRAM_PATH ${CMAKE_PROGRAM_PATH} ${_VCPKG_TOOLS_DIR})
-        endif()
-    endforeach()
-
-    option(VCPKG_APPLOCAL_DEPS "Automatically copy dependencies into the output directory for executables." ON)
-    function(add_executable name)
-        _add_executable(${ARGV})
-        list(FIND ARGV "IMPORTED" IMPORTED_IDX)
-        list(FIND ARGV "ALIAS" ALIAS_IDX)
-        if(IMPORTED_IDX EQUAL -1 AND ALIAS_IDX EQUAL -1)
-            if(VCPKG_APPLOCAL_DEPS)
-                add_custom_command(TARGET ${name} POST_BUILD
-                    COMMAND powershell -noprofile -executionpolicy Bypass -file ${_VCPKG_TOOLCHAIN_DIR}/msbuild/applocal.ps1
-                        -targetBinary $<TARGET_FILE:${name}>
-                        -installedDir "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}$<$<CONFIG:Debug>:/debug>/bin"
-                        -OutVariable out
-                )
-            endif()
-            set_target_properties(${name} PROPERTIES VS_USER_PROPS do_not_import_user.props)
-            set_target_properties(${name} PROPERTIES VS_GLOBAL_VcpkgEnabled false)
-        endif()
-    endfunction()
-
-    function(add_library name)
-        _add_library(${ARGV})
-        list(FIND ARGV "IMPORTED" IMPORTED_IDX)
-        list(FIND ARGV "INTERFACE" INTERFACE_IDX)
-        list(FIND ARGV "ALIAS" ALIAS_IDX)
-        if(IMPORTED_IDX EQUAL -1 AND INTERFACE_IDX EQUAL -1 AND ALIAS_IDX EQUAL -1)
-            set_target_properties(${name} PROPERTIES VS_USER_PROPS do_not_import_user.props)
-            set_target_properties(${name} PROPERTIES VS_GLOBAL_VcpkgEnabled false)
-        endif()
-    endfunction()
+set(CMAKE_PROGRAM_PATH ${CMAKE_PROGRAM_PATH} ${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/tools)
+file(GLOB _VCPKG_TOOLS_DIRS ${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/tools/*)
+foreach(_VCPKG_TOOLS_DIR ${_VCPKG_TOOLS_DIRS})
+    if(IS_DIRECTORY ${_VCPKG_TOOLS_DIR})
+        set(CMAKE_PROGRAM_PATH ${CMAKE_PROGRAM_PATH} ${_VCPKG_TOOLS_DIR})
+    endif()
+endforeach()
 
-    macro(find_package name)
-        if(name STREQUAL "Boost")
-            unset(Boost_USE_STATIC_LIBS)
+option(VCPKG_APPLOCAL_DEPS "Automatically copy dependencies into the output directory for executables." ON)
+function(add_executable name)
+    _add_executable(${ARGV})
+    list(FIND ARGV "IMPORTED" IMPORTED_IDX)
+    list(FIND ARGV "ALIAS" ALIAS_IDX)
+    if(IMPORTED_IDX EQUAL -1 AND ALIAS_IDX EQUAL -1)
+        if(VCPKG_APPLOCAL_DEPS)
+            add_custom_command(TARGET ${name} POST_BUILD
+                COMMAND powershell -noprofile -executionpolicy Bypass -file ${_VCPKG_TOOLCHAIN_DIR}/msbuild/applocal.ps1
+                    -targetBinary $<TARGET_FILE:${name}>
+                    -installedDir "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}$<$<CONFIG:Debug>:/debug>/bin"
+                    -OutVariable out
+            )
         endif()
-        _find_package(${ARGV})
-    endmacro()
+        set_target_properties(${name} PROPERTIES VS_USER_PROPS do_not_import_user.props)
+        set_target_properties(${name} PROPERTIES VS_GLOBAL_VcpkgEnabled false)
+    endif()
+endfunction()
 
-    set(VCPKG_TOOLCHAIN ON)
-endif()
+function(add_library name)
+    _add_library(${ARGV})
+    list(FIND ARGV "IMPORTED" IMPORTED_IDX)
+    list(FIND ARGV "INTERFACE" INTERFACE_IDX)
+    list(FIND ARGV "ALIAS" ALIAS_IDX)
+    if(IMPORTED_IDX EQUAL -1 AND INTERFACE_IDX EQUAL -1 AND ALIAS_IDX EQUAL -1)
+        set_target_properties(${name} PROPERTIES VS_USER_PROPS do_not_import_user.props)
+        set_target_properties(${name} PROPERTIES VS_GLOBAL_VcpkgEnabled false)
+    endif()
+endfunction()
+
+macro(find_package name)
+    if(name STREQUAL "Boost")
+        unset(Boost_USE_STATIC_LIBS)
+    endif()
+    _find_package(${ARGV})
+endmacro()
 
-set(_UNUSED ${CMAKE_TOOLCHAIN_FILE})
+set(VCPKG_TOOLCHAIN ON)
 set(_UNUSED ${CMAKE_ERROR_ON_ABSOLUTE_INSTALL_DESTINATION})
 set(_UNUSED ${CMAKE_EXPORT_NO_PACKAGE_REGISTRY})
 set(_UNUSED ${CMAKE_FIND_PACKAGE_NO_PACKAGE_REGISTRY})
 set(_UNUSED ${CMAKE_FIND_PACKAGE_NO_SYSTEM_PACKAGE_REGISTRY})
 set(_UNUSED ${CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS_SKIP})
+
+if(NOT _CMAKE_IN_TRY_COMPILE)
+    file(TO_CMAKE_PATH "${VCPKG_CHAINLOAD_TOOLCHAIN_FILE}" _chainload_file)
+    file(WRITE "${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/vcpkg.config.cmake"
+        "set(VCPKG_TARGET_TRIPLET \"${VCPKG_TARGET_TRIPLET}\" CACHE STRING \"\")\n"
+        "set(VCPKG_APPLOCAL_DEPS \"${VCPKG_APPLOCAL_DEPS}\" CACHE STRING \"\")\n"
+        "set(VCPKG_CHAINLOAD_TOOLCHAIN_FILE \"${_chainload_file}\" CACHE STRING \"\")\n")
+endif()
\ No newline at end of file
diff --git a/scripts/cmake/vcpkg_configure_cmake.cmake b/scripts/cmake/vcpkg_configure_cmake.cmake
index bfb6a19fd..b979245aa 100644
--- a/scripts/cmake/vcpkg_configure_cmake.cmake
+++ b/scripts/cmake/vcpkg_configure_cmake.cmake
@@ -61,37 +61,39 @@ function(vcpkg_configure_cmake)
         set(GENERATOR ${_csc_GENERATOR})
     elseif(_csc_PREFER_NINJA AND NOT VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore" AND NOT _csc_HOST_ARCHITECTURE STREQUAL "x86")
         set(GENERATOR "Ninja")
-    elseif(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore" AND TRIPLET_SYSTEM_ARCH MATCHES "x86" AND VCPKG_PLATFORM_TOOLSET MATCHES "v140")
+    elseif(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore" AND VCPKG_TARGET_ARCHITECTURE MATCHES "x86" AND VCPKG_PLATFORM_TOOLSET MATCHES "v140")
         set(GENERATOR "Visual Studio 14 2015")
-    elseif(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore" AND TRIPLET_SYSTEM_ARCH MATCHES "x64" AND VCPKG_PLATFORM_TOOLSET MATCHES "v140")
+    elseif(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore" AND VCPKG_TARGET_ARCHITECTURE MATCHES "x64" AND VCPKG_PLATFORM_TOOLSET MATCHES "v140")
         set(GENERATOR "Visual Studio 14 2015 Win64")
-    elseif(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore" AND TRIPLET_SYSTEM_ARCH MATCHES "arm" AND VCPKG_PLATFORM_TOOLSET MATCHES "v140")
+    elseif(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore" AND VCPKG_TARGET_ARCHITECTURE MATCHES "arm" AND VCPKG_PLATFORM_TOOLSET MATCHES "v140")
         set(GENERATOR "Visual Studio 14 2015 ARM")
-    elseif(TRIPLET_SYSTEM_ARCH MATCHES "x86" AND VCPKG_PLATFORM_TOOLSET MATCHES "v140")
+    elseif(VCPKG_TARGET_ARCHITECTURE MATCHES "x86" AND VCPKG_PLATFORM_TOOLSET MATCHES "v140")
         set(GENERATOR "Visual Studio 14 2015")
-    elseif(TRIPLET_SYSTEM_ARCH MATCHES "x64" AND VCPKG_PLATFORM_TOOLSET MATCHES "v140")
+    elseif(VCPKG_TARGET_ARCHITECTURE MATCHES "x64" AND VCPKG_PLATFORM_TOOLSET MATCHES "v140")
         set(GENERATOR "Visual Studio 14 2015 Win64")
-    elseif(TRIPLET_SYSTEM_ARCH MATCHES "arm" AND VCPKG_PLATFORM_TOOLSET MATCHES "v140")
+    elseif(VCPKG_TARGET_ARCHITECTURE MATCHES "arm" AND VCPKG_PLATFORM_TOOLSET MATCHES "v140")
         set(GENERATOR "Visual Studio 14 2015 ARM")
 
-    elseif(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore" AND TRIPLET_SYSTEM_ARCH MATCHES "x86" AND VCPKG_PLATFORM_TOOLSET MATCHES "v141")
+    elseif(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore" AND VCPKG_TARGET_ARCHITECTURE MATCHES "x86" AND VCPKG_PLATFORM_TOOLSET MATCHES "v141")
         set(GENERATOR "Visual Studio 15 2017")
-    elseif(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore" AND TRIPLET_SYSTEM_ARCH MATCHES "x64" AND VCPKG_PLATFORM_TOOLSET MATCHES "v141")
+    elseif(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore" AND VCPKG_TARGET_ARCHITECTURE MATCHES "x64" AND VCPKG_PLATFORM_TOOLSET MATCHES "v141")
         set(GENERATOR "Visual Studio 15 2017 Win64")
-    elseif(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore" AND TRIPLET_SYSTEM_ARCH STREQUAL "arm" AND VCPKG_PLATFORM_TOOLSET MATCHES "v141")
+    elseif(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore" AND VCPKG_TARGET_ARCHITECTURE STREQUAL "arm" AND VCPKG_PLATFORM_TOOLSET MATCHES "v141")
         set(GENERATOR "Visual Studio 15 2017 ARM")
-    elseif(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore" AND TRIPLET_SYSTEM_ARCH STREQUAL "arm64" AND VCPKG_PLATFORM_TOOLSET MATCHES "v141")
+    elseif(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore" AND VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64" AND VCPKG_PLATFORM_TOOLSET MATCHES "v141")
         set(GENERATOR "Visual Studio 15 2017")    
         set(ARCH "ARM64")
-    elseif(TRIPLET_SYSTEM_ARCH MATCHES "x86" AND VCPKG_PLATFORM_TOOLSET MATCHES "v141")
+    elseif(VCPKG_TARGET_ARCHITECTURE MATCHES "x86" AND VCPKG_PLATFORM_TOOLSET MATCHES "v141")
         set(GENERATOR "Visual Studio 15 2017")
-    elseif(TRIPLET_SYSTEM_ARCH MATCHES "x64" AND VCPKG_PLATFORM_TOOLSET MATCHES "v141")
+    elseif(VCPKG_TARGET_ARCHITECTURE MATCHES "x64" AND VCPKG_PLATFORM_TOOLSET MATCHES "v141")
         set(GENERATOR "Visual Studio 15 2017 Win64")
-    elseif(TRIPLET_SYSTEM_ARCH STREQUAL "arm" AND VCPKG_PLATFORM_TOOLSET MATCHES "v141")
+    elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm" AND VCPKG_PLATFORM_TOOLSET MATCHES "v141")
         set(GENERATOR "Visual Studio 15 2017 ARM")
-    elseif(TRIPLET_SYSTEM_ARCH STREQUAL "arm64" AND VCPKG_PLATFORM_TOOLSET MATCHES "v141")
+    elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64" AND VCPKG_PLATFORM_TOOLSET MATCHES "v141")
         set(GENERATOR "Visual Studio 15 2017")
         set(ARCH "ARM64")
+    else()
+        message(FATAL_ERROR "Unable to determine appropriate generator for: ${VCPKG_CMAKE_SYSTEM_NAME}-${VCPKG_TARGET_ARCHITECTURE}-${VCPKG_PLATFORM_TOOLSET}")
     endif()
     
     # If we use Ninja, make sure it's on PATH
@@ -104,15 +106,18 @@ function(vcpkg_configure_cmake)
     file(REMOVE_RECURSE ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg)
 
     if(DEFINED VCPKG_CMAKE_SYSTEM_NAME)
-        list(APPEND _csc_OPTIONS -DCMAKE_SYSTEM_NAME=${VCPKG_CMAKE_SYSTEM_NAME})
+        list(APPEND _csc_OPTIONS "-DCMAKE_SYSTEM_NAME=${VCPKG_CMAKE_SYSTEM_NAME}")
     endif()
     if(DEFINED VCPKG_CMAKE_SYSTEM_VERSION)
-        list(APPEND _csc_OPTIONS -DCMAKE_SYSTEM_VERSION=${VCPKG_CMAKE_SYSTEM_VERSION})
+        list(APPEND _csc_OPTIONS "-DCMAKE_SYSTEM_VERSION=${VCPKG_CMAKE_SYSTEM_VERSION}")
     endif()
-    if(DEFINED VCPKG_LIBRARY_LINKAGE AND VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
+
+    if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
         list(APPEND _csc_OPTIONS -DBUILD_SHARED_LIBS=ON)
-    elseif(DEFINED VCPKG_LIBRARY_LINKAGE AND VCPKG_LIBRARY_LINKAGE STREQUAL static)
+    elseif(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
         list(APPEND _csc_OPTIONS -DBUILD_SHARED_LIBS=OFF)
+    else()
+        message(FATAL_ERROR "Invalid setting for VCPKG_LIBRARY_LINKAGE: \"${VCPKG_LIBRARY_LINKAGE}\". It must be \"static\" or \"dynamic\"")
     endif()
 
     if((NOT DEFINED VCPKG_CXX_FLAGS_DEBUG AND NOT DEFINED VCPKG_C_FLAGS_DEBUG) OR
@@ -131,10 +136,45 @@ function(vcpkg_configure_cmake)
         message(FATAL_ERROR "You must set both the VCPKG_CXX_FLAGS and VCPKG_C_FLAGS")
     endif()
 
+    if(VCPKG_CHAINLOAD_TOOLCHAIN_FILE)
+        list(APPEND _csc_OPTIONS "-DVCPKG_CHAINLOAD_TOOLCHAIN_FILE=${VCPKG_CHAINLOAD_TOOLCHAIN_FILE}")
+    else()
+        set(VCPKG_CXX_FLAGS " /DWIN32 /D_WINDOWS /W3 /utf-8 /GR /EHsc /MP ${VCPKG_CXX_FLAGS}")
+        set(VCPKG_C_FLAGS " /DWIN32 /D_WINDOWS /W3 /utf-8 /MP ${VCPKG_C_FLAGS}")
+        if(VCPKG_CRT_LINKAGE STREQUAL "dynamic")
+            list(APPEND _csc_OPTIONS_DEBUG
+                "-DCMAKE_CXX_FLAGS_DEBUG=/D_DEBUG /MDd /Z7 /Ob0 /Od /RTC1 ${VCPKG_CXX_FLAGS_DEBUG}"
+                "-DCMAKE_C_FLAGS_DEBUG=/D_DEBUG /MDd /Z7 /Ob0 /Od /RTC1 ${VCPKG_C_FLAGS_DEBUG}"
+            )
+            list(APPEND _csc_OPTIONS_RELEASE
+                "-DCMAKE_CXX_FLAGS_RELEASE=/MD /O2 /Oi /Gy /DNDEBUG /Z7 ${VCPKG_CXX_FLAGS_RELEASE}"
+                "-DCMAKE_C_FLAGS_RELEASE=/MD /O2 /Oi /Gy /DNDEBUG /Z7 ${VCPKG_C_FLAGS_RELEASE}"
+            )
+        elseif(VCPKG_CRT_LINKAGE STREQUAL "static")
+            list(APPEND _csc_OPTIONS_DEBUG
+                "-DCMAKE_CXX_FLAGS_DEBUG=/D_DEBUG /MTd /Z7 /Ob0 /Od /RTC1 ${VCPKG_CXX_FLAGS_DEBUG}"
+                "-DCMAKE_C_FLAGS_DEBUG=/D_DEBUG /MTd /Z7 /Ob0 /Od /RTC1 ${VCPKG_C_FLAGS_DEBUG}"
+            )
+            list(APPEND _csc_OPTIONS_RELEASE
+                "-DCMAKE_CXX_FLAGS_RELEASE=/MT /O2 /Oi /Gy /DNDEBUG /Z7 ${VCPKG_CXX_FLAGS_RELEASE}"
+                "-DCMAKE_C_FLAGS_RELEASE=/MT /O2 /Oi /Gy /DNDEBUG /Z7 ${VCPKG_C_FLAGS_RELEASE}"
+            )
+        else()
+            message(FATAL_ERROR "Invalid setting for VCPKG_CRT_LINKAGE: \"${VCPKG_CRT_LINKAGE}\". It must be \"static\" or \"dynamic\"")
+        endif()
+
+        list(APPEND _csc_OPTIONS_RELEASE
+            "-DCMAKE_SHARED_LINKER_FLAGS_RELEASE=/DEBUG /INCREMENTAL:NO /OPT:REF /OPT:ICF ${VCPKG_LINKER_FLAGS}"
+            "-DCMAKE_EXE_LINKER_FLAGS_RELEASE=/DEBUG /INCREMENTAL:NO /OPT:REF /OPT:ICF ${VCPKG_LINKER_FLAGS}"
+        )
+        list(APPEND _csc_OPTIONS
+            "-DCMAKE_CXX_FLAGS=${VCPKG_CXX_FLAGS}"
+            "-DCMAKE_C_FLAGS=${VCPKG_C_FLAGS}"
+        )
+    endif()
+
     list(APPEND _csc_OPTIONS
         "-DVCPKG_TARGET_TRIPLET=${TARGET_TRIPLET}"
-        "-DCMAKE_CXX_FLAGS= /DWIN32 /D_WINDOWS /W3 /utf-8 /GR /EHsc /MP ${VCPKG_CXX_FLAGS}"
-        "-DCMAKE_C_FLAGS= /DWIN32 /D_WINDOWS /W3 /utf-8 /MP ${VCPKG_C_FLAGS}"
         "-DCMAKE_EXPORT_NO_PACKAGE_REGISTRY=ON"
         "-DCMAKE_FIND_PACKAGE_NO_PACKAGE_REGISTRY=ON"
         "-DCMAKE_FIND_PACKAGE_NO_SYSTEM_PACKAGE_REGISTRY=ON"
@@ -151,32 +191,6 @@ function(vcpkg_configure_cmake)
         )
     endif()
 
-    if(DEFINED VCPKG_CRT_LINKAGE AND VCPKG_CRT_LINKAGE STREQUAL dynamic)
-        list(APPEND _csc_OPTIONS_DEBUG
-            "-DCMAKE_CXX_FLAGS_DEBUG=/D_DEBUG /MDd /Z7 /Ob0 /Od /RTC1 ${VCPKG_CXX_FLAGS_DEBUG}"
-            "-DCMAKE_C_FLAGS_DEBUG=/D_DEBUG /MDd /Z7 /Ob0 /Od /RTC1 ${VCPKG_C_FLAGS_DEBUG}"
-        )
-        list(APPEND _csc_OPTIONS_RELEASE
-            "-DCMAKE_CXX_FLAGS_RELEASE=/MD /O2 /Oi /Gy /DNDEBUG /Z7 ${VCPKG_CXX_FLAGS_RELEASE}"
-            "-DCMAKE_C_FLAGS_RELEASE=/MD /O2 /Oi /Gy /DNDEBUG /Z7 ${VCPKG_C_FLAGS_RELEASE}"
-        )
-
-    elseif(DEFINED VCPKG_CRT_LINKAGE AND VCPKG_CRT_LINKAGE STREQUAL static)
-        list(APPEND _csc_OPTIONS_DEBUG
-            "-DCMAKE_CXX_FLAGS_DEBUG=/D_DEBUG /MTd /Z7 /Ob0 /Od /RTC1 ${VCPKG_CXX_FLAGS_DEBUG}"
-            "-DCMAKE_C_FLAGS_DEBUG=/D_DEBUG /MTd /Z7 /Ob0 /Od /RTC1 ${VCPKG_C_FLAGS_DEBUG}"
-        )
-        list(APPEND _csc_OPTIONS_RELEASE
-            "-DCMAKE_CXX_FLAGS_RELEASE=/MT /O2 /Oi /Gy /DNDEBUG /Z7 ${VCPKG_CXX_FLAGS_RELEASE}"
-            "-DCMAKE_C_FLAGS_RELEASE=/MT /O2 /Oi /Gy /DNDEBUG /Z7 ${VCPKG_C_FLAGS_RELEASE}"
-        )
-    endif()
-
-    list(APPEND _csc_OPTIONS_RELEASE
-        "-DCMAKE_SHARED_LINKER_FLAGS_RELEASE=/DEBUG /INCREMENTAL:NO /OPT:REF /OPT:ICF ${VCPKG_LINKER_FLAGS}"
-        "-DCMAKE_EXE_LINKER_FLAGS_RELEASE=/DEBUG /INCREMENTAL:NO /OPT:REF /OPT:ICF ${VCPKG_LINKER_FLAGS}"
-    )
-
     message(STATUS "Configuring ${TARGET_TRIPLET}-rel")
     file(MAKE_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel)
     vcpkg_execute_required_process(
-- 
cgit v1.2.3


From 374253cb1b12a60925693130132f1a6ab6c3a83a Mon Sep 17 00:00:00 2001
From: Alexander Karatarakis <alkarata@microsoft.com>
Date: Mon, 16 Oct 2017 15:39:41 -0700
Subject: [ninja] Update to 1.8.2

---
 scripts/cmake/vcpkg_find_acquire_program.cmake | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'scripts')

diff --git a/scripts/cmake/vcpkg_find_acquire_program.cmake b/scripts/cmake/vcpkg_find_acquire_program.cmake
index 51e394bf1..b81675c13 100644
--- a/scripts/cmake/vcpkg_find_acquire_program.cmake
+++ b/scripts/cmake/vcpkg_find_acquire_program.cmake
@@ -101,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)
-- 
cgit v1.2.3