aboutsummaryrefslogtreecommitdiff
path: root/scripts/buildsystems
diff options
context:
space:
mode:
authorRobert Schumacher <roschuma@microsoft.com>2016-11-07 21:38:41 -0800
committerRobert Schumacher <roschuma@microsoft.com>2016-11-07 21:38:41 -0800
commitef293701aaceb6b3e8ffd91dc7ae0afa66b83998 (patch)
tree59127e5c17c46db1b96505fbc4760a97dd6cf026 /scripts/buildsystems
parenteaebe2888ab97de74200904807ae884419ccc195 (diff)
parent5e058c21928de5092242cb6e0c590c3a2d758c6c (diff)
downloadvcpkg-ef293701aaceb6b3e8ffd91dc7ae0afa66b83998.tar.gz
vcpkg-ef293701aaceb6b3e8ffd91dc7ae0afa66b83998.zip
Merge pull request #219 Barath-Kannan/qt5-add
Qt5 add
Diffstat (limited to 'scripts/buildsystems')
-rw-r--r--scripts/buildsystems/vcpkg.cmake2
1 files changed, 2 insertions, 0 deletions
diff --git a/scripts/buildsystems/vcpkg.cmake b/scripts/buildsystems/vcpkg.cmake
index 50b489b1a..257007e45 100644
--- a/scripts/buildsystems/vcpkg.cmake
+++ b/scripts/buildsystems/vcpkg.cmake
@@ -53,12 +53,14 @@ if(NOT VCPKG_TOOLCHAIN)
if(OVERRIDE_ADD_EXECUTABLE)
function(add_executable name)
_add_executable(${ARGV})
+ if(NOT "IMPORTED" IN_LIST ARGV)
add_custom_command(TARGET ${name} POST_BUILD
COMMAND powershell -noprofile -executionpolicy UnRestricted -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()
endfunction()
endif()
set(VCPKG_TOOLCHAIN ON)