From e8f819e04e6aed6327537f954a9eda02fca49d1a Mon Sep 17 00:00:00 2001
From: Robert Schumacher <roschuma@microsoft.com>
Date: Tue, 27 Jun 2017 11:24:31 -0700
Subject: [vcpkg-fixup-cmake-targets] Fix bug when port has no unused cmake
 config files.

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

(limited to 'scripts')

diff --git a/scripts/cmake/vcpkg_fixup_cmake_targets.cmake b/scripts/cmake/vcpkg_fixup_cmake_targets.cmake
index c56b96ccc..6fa096cbd 100644
--- a/scripts/cmake/vcpkg_fixup_cmake_targets.cmake
+++ b/scripts/cmake/vcpkg_fixup_cmake_targets.cmake
@@ -73,7 +73,9 @@ function(vcpkg_fixup_cmake_targets)
         "${DEBUG_SHARE}/*[Cc]onfigVersion.cmake"
         "${DEBUG_SHARE}/*[Cc]onfig-version.cmake"
     )
-    file(REMOVE ${UNUSED_FILES})
+    if(UNUSED_FILES)
+        file(REMOVE ${UNUSED_FILES})
+    endif()
 
     file(GLOB RELEASE_TARGETS
         "${RELEASE_SHARE}/*[Tt]argets-release.cmake"
-- 
cgit v1.2.3


From c21a2fe38ab9523974a80194d6cea5dae6fcb76a Mon Sep 17 00:00:00 2001
From: Robert Schumacher <roschuma@microsoft.com>
Date: Fri, 30 Jun 2017 17:33:48 -0700
Subject: [angle] Add preliminary UWP support

---
 scripts/buildsystems/vcpkg.cmake | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'scripts')

diff --git a/scripts/buildsystems/vcpkg.cmake b/scripts/buildsystems/vcpkg.cmake
index 513c33ecb..41bdb3e60 100644
--- a/scripts/buildsystems/vcpkg.cmake
+++ b/scripts/buildsystems/vcpkg.cmake
@@ -140,3 +140,10 @@ if(NOT VCPKG_TOOLCHAIN)
 
     set(VCPKG_TOOLCHAIN ON)
 endif()
+
+set(_UNUSED ${CMAKE_TOOLCHAIN_FILE})
+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})
-- 
cgit v1.2.3


From d222302b2f4bd2d857949fde71b927385d703acd Mon Sep 17 00:00:00 2001
From: Arkady Shapkin <arkady.shapkin@gmail.com>
Date: Fri, 30 Jun 2017 20:49:54 +0300
Subject: [cereal] Portfile fix

---
 scripts/cmake/vcpkg_fixup_cmake_targets.cmake | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'scripts')

diff --git a/scripts/cmake/vcpkg_fixup_cmake_targets.cmake b/scripts/cmake/vcpkg_fixup_cmake_targets.cmake
index 6fa096cbd..eaf3bb966 100644
--- a/scripts/cmake/vcpkg_fixup_cmake_targets.cmake
+++ b/scripts/cmake/vcpkg_fixup_cmake_targets.cmake
@@ -116,6 +116,10 @@ function(vcpkg_fixup_cmake_targets)
     file(GLOB MAIN_CONFIGS "${RELEASE_SHARE}/*[Cc]onfig.cmake")
     foreach(MAIN_CONFIG ${MAIN_CONFIGS})
         file(READ ${MAIN_CONFIG} _contents)
+        string(REGEX REPLACE
+            "get_filename_component\\(_IMPORT_PREFIX \"\\\${CMAKE_CURRENT_LIST_FILE}\" PATH\\)(\nget_filename_component\\(_IMPORT_PREFIX \"\\\${_IMPORT_PREFIX}\" PATH\\))*"
+            "get_filename_component(_IMPORT_PREFIX \"\${CMAKE_CURRENT_LIST_FILE}\" PATH)\nget_filename_component(_IMPORT_PREFIX \"\${_IMPORT_PREFIX}\" PATH)\nget_filename_component(_IMPORT_PREFIX \"\${_IMPORT_PREFIX}\" PATH)"
+            _contents "${_contents}")
         string(REGEX REPLACE
             "get_filename_component\\(PACKAGE_PREFIX_DIR \"\\\${CMAKE_CURRENT_LIST_DIR}/\\.\\./(\\.\\./)*\" ABSOLUTE\\)"
             "get_filename_component(PACKAGE_PREFIX_DIR \"\${CMAKE_CURRENT_LIST_DIR}/../../\" ABSOLUTE)"
-- 
cgit v1.2.3


From 5498864711a2c7b1224e2ebfeff0269d591a2136 Mon Sep 17 00:00:00 2001
From: Robert Schumacher <roschuma@microsoft.com>
Date: Tue, 11 Jul 2017 14:09:56 -0700
Subject: [vcpkg-toolchain] Add INPUT_FILE NUL. Fixes #1431.

---
 scripts/cmake/vcpkg_get_windows_sdk.cmake | 1 +
 1 file changed, 1 insertion(+)

(limited to 'scripts')

diff --git a/scripts/cmake/vcpkg_get_windows_sdk.cmake b/scripts/cmake/vcpkg_get_windows_sdk.cmake
index ca58ab10a..64d8838e7 100644
--- a/scripts/cmake/vcpkg_get_windows_sdk.cmake
+++ b/scripts/cmake/vcpkg_get_windows_sdk.cmake
@@ -2,6 +2,7 @@
 function(vcpkg_get_windows_sdk ret)
     execute_process(
         COMMAND powershell.exe -NoProfile -ExecutionPolicy Bypass -Command "& {& '${VCPKG_ROOT_DIR}/scripts/getWindowsSDK.ps1'}" 2>&1
+        INPUT_FILE NUL
         OUTPUT_VARIABLE WINDOWS_SDK
         RESULT_VARIABLE error_code)
 
-- 
cgit v1.2.3


From 6950aeb6378adb47ff467a79d58ae8d4b5abe9cb Mon Sep 17 00:00:00 2001
From: Robert Schumacher <roschuma@microsoft.com>
Date: Thu, 13 Jul 2017 17:47:20 -0700
Subject: [vcpkg-applocal] Recurse into other binaries. Fixes #1435.

---
 scripts/buildsystems/msbuild/applocal.ps1 | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'scripts')

diff --git a/scripts/buildsystems/msbuild/applocal.ps1 b/scripts/buildsystems/msbuild/applocal.ps1
index 932ba11cd..08a6d9a8f 100644
--- a/scripts/buildsystems/msbuild/applocal.ps1
+++ b/scripts/buildsystems/msbuild/applocal.ps1
@@ -50,6 +50,9 @@ function resolve([string]$targetBinary) {
             deployBinary $targetBinaryDir $installedDir "$_"
             if (Test-Path function:\deployPluginsIfQt) { deployPluginsIfQt $targetBinaryDir "$g_install_root\plugins" "$_" }
             resolve "$targetBinaryDir\$_"
+        } elseif (Test-Path "$targetBinaryDir\$_") {
+            Write-Verbose "  ${_}: $_ not found in vcpkg; locally deployed"
+            resolve "$targetBinaryDir\$_"
         } else {
             Write-Verbose "  ${_}: $installedDir\$_ not found"
         }
-- 
cgit v1.2.3