aboutsummaryrefslogtreecommitdiff
path: root/scripts/buildsystems
diff options
context:
space:
mode:
authorCharles Barto <bartoc@umich.edu>2016-11-01 19:19:05 -0400
committerCharles Barto <bartoc@umich.edu>2016-11-01 19:19:05 -0400
commitb25c13c1551456dc89ca959c7133b1cc6117532e (patch)
tree12cbd5ba6a4be64fb5512693276b847456c991eb /scripts/buildsystems
parenta79c348045f513de8fb24ffb12532c1b1a396c3c (diff)
downloadvcpkg-b25c13c1551456dc89ca959c7133b1cc6117532e.tar.gz
vcpkg-b25c13c1551456dc89ca959c7133b1cc6117532e.zip
made some qt5 fixes
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 88acc8436..4f6805457 100644
--- a/scripts/buildsystems/vcpkg.cmake
+++ b/scripts/buildsystems/vcpkg.cmake
@@ -42,12 +42,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)