diff options
| author | Robert Schumacher <roschuma@microsoft.com> | 2016-11-07 16:28:14 -0800 |
|---|---|---|
| committer | Robert Schumacher <roschuma@microsoft.com> | 2016-11-07 16:28:14 -0800 |
| commit | 1bc75b551d3a8cf3e148b98b9341f3c29e0026b4 (patch) | |
| tree | d9a22734a37141a910f579f84cf3fd68a43582e5 /scripts/buildsystems | |
| parent | 2c1d67537072b66850346f762f00d908398458e0 (diff) | |
| parent | 355d79ea4098834634606f3eca65d1261474f0d9 (diff) | |
| download | vcpkg-1bc75b551d3a8cf3e148b98b9341f3c29e0026b4.tar.gz vcpkg-1bc75b551d3a8cf3e148b98b9341f3c29e0026b4.zip | |
Merge branch 'qt5-add' of https://github.com/Barath-Kannan/vcpkg into Barath-Kannan-qt5-add
Diffstat (limited to 'scripts/buildsystems')
| -rw-r--r-- | scripts/buildsystems/vcpkg.cmake | 2 |
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) |