aboutsummaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorRobert Schumacher <roschuma@microsoft.com>2017-07-13 17:47:20 -0700
committerRobert Schumacher <roschuma@microsoft.com>2017-07-13 17:47:20 -0700
commit6950aeb6378adb47ff467a79d58ae8d4b5abe9cb (patch)
tree4510ebb1664b94e425828b32fdc3c223da5789da /scripts
parent06ddd3299c69b591ffbf9069a16b419a50fbdbab (diff)
downloadvcpkg-6950aeb6378adb47ff467a79d58ae8d4b5abe9cb.tar.gz
vcpkg-6950aeb6378adb47ff467a79d58ae8d4b5abe9cb.zip
[vcpkg-applocal] Recurse into other binaries. Fixes #1435.
Diffstat (limited to 'scripts')
-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"
}