diff options
| author | Sander Cox <sander@paralleldimension.nl> | 2020-10-22 02:43:11 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-10-21 17:43:11 -0700 |
| commit | 4a11bdd440836060271bae17ab7de120b9ac6be2 (patch) | |
| tree | 292cca63af8b0cb46dd715bdc80ec84982e1a70a /scripts | |
| parent | aff62d3487cd4c47ebc7f1dfd7a7023665403e20 (diff) | |
| download | vcpkg-4a11bdd440836060271bae17ab7de120b9ac6be2.tar.gz vcpkg-4a11bdd440836060271bae17ab7de120b9ac6be2.zip | |
[vcpkg] Vcpkg appinstall deps fixes (#14129)
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/buildsystems/vcpkg.cmake | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/buildsystems/vcpkg.cmake b/scripts/buildsystems/vcpkg.cmake index 7e6d5408a..08d0c8d20 100644 --- a/scripts/buildsystems/vcpkg.cmake +++ b/scripts/buildsystems/vcpkg.cmake @@ -459,10 +459,10 @@ function(x_vcpkg_install_local_dependencies) cmake_parse_arguments(__VCPKG_APPINSTALL "" "DESTINATION" "TARGETS" ${ARGN}) foreach(TARGET ${__VCPKG_APPINSTALL_TARGETS}) - _install(CODE "message(\"-- Installing app dependencies for ${TARGET}...\") + install(CODE "message(\"-- Installing app dependencies for ${TARGET}...\") execute_process(COMMAND powershell -noprofile -executionpolicy Bypass -file \"${_VCPKG_TOOLCHAIN_DIR}/msbuild/applocal.ps1\" - -targetBinary \"${__VCPKG_APPINSTALL_DESTINATION}/$<TARGET_FILE_NAME:${TARGET}>\" + -targetBinary \"\${CMAKE_INSTALL_PREFIX}/${__VCPKG_APPINSTALL_DESTINATION}/$<TARGET_FILE_NAME:${TARGET}>\" -installedDir \"${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}$<$<CONFIG:Debug>:/debug>/bin\" -OutVariable out)") endforeach() |