aboutsummaryrefslogtreecommitdiff
path: root/scripts/buildsystems/msbuild
diff options
context:
space:
mode:
authorDaniel Shaw <t-dansha@microsoft.com>2017-07-14 13:22:09 -0700
committerDaniel Shaw <t-dansha@microsoft.com>2017-07-14 13:22:09 -0700
commit4f7f1cf5d159f69af5f10925245799dc91af7968 (patch)
tree9495a6abfe8494d8276dadef6c160e88d35128f1 /scripts/buildsystems/msbuild
parent336e25218a73f9b54120e3c35b3d28e6426deeb1 (diff)
parent2055a9cd4490861aa7ce9e1af23c0232f97552c9 (diff)
downloadvcpkg-4f7f1cf5d159f69af5f10925245799dc91af7968.tar.gz
vcpkg-4f7f1cf5d159f69af5f10925245799dc91af7968.zip
Merge remote-tracking branch 'origin' into create_install_tests
Diffstat (limited to 'scripts/buildsystems/msbuild')
-rw-r--r--scripts/buildsystems/msbuild/applocal.ps13
1 files changed, 3 insertions, 0 deletions
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"
}