aboutsummaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorRobert Schumacher <roschuma@microsoft.com>2017-03-29 09:54:48 -0700
committerGitHub <noreply@github.com>2017-03-29 09:54:48 -0700
commit80e1a39a5dd9457986407967bf303214315884a2 (patch)
tree8af18951f5ce0de7d82850368fced449bf85383e /scripts
parent490ba941ef8b1ef4bb6061a7eeafdcb20dee6bad (diff)
parent17c819c353b420f312f1e427f8d998c8a6d73cd6 (diff)
downloadvcpkg-80e1a39a5dd9457986407967bf303214315884a2.tar.gz
vcpkg-80e1a39a5dd9457986407967bf303214315884a2.zip
Merge pull request #864 from codicodi/fix-toolchain
[vcpkg.cmake] handle alias executable targets
Diffstat (limited to 'scripts')
-rw-r--r--scripts/buildsystems/vcpkg.cmake3
1 files changed, 2 insertions, 1 deletions
diff --git a/scripts/buildsystems/vcpkg.cmake b/scripts/buildsystems/vcpkg.cmake
index 80f35edbd..8e2204dfb 100644
--- a/scripts/buildsystems/vcpkg.cmake
+++ b/scripts/buildsystems/vcpkg.cmake
@@ -85,7 +85,8 @@ if(NOT VCPKG_TOOLCHAIN)
function(add_executable name)
_add_executable(${ARGV})
list(FIND ARGV "IMPORTED" IMPORTED_IDX)
- if(IMPORTED_IDX EQUAL -1)
+ 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 UnRestricted -file ${_VCPKG_TOOLCHAIN_DIR}/msbuild/applocal.ps1