diff options
| author | Sander Cox <sander@resolume.com> | 2020-12-08 01:06:02 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-07 16:06:02 -0800 |
| commit | ced334b24dfc992ab0d1fd3af803dbf20481be25 (patch) | |
| tree | 6c68f28f23801199e0f96c964a5ece6ecebd7ec8 /scripts | |
| parent | 4ee7e519d266aca068d9af57a8ffa38416da1ea2 (diff) | |
| download | vcpkg-ced334b24dfc992ab0d1fd3af803dbf20481be25.tar.gz vcpkg-ced334b24dfc992ab0d1fd3af803dbf20481be25.zip | |
[vcpkg] x_vcpkg_install_local_dependencies fixes (#14977)
* Conversion to PARSE_ARGV was missing parameter
* Cannot install for interface_libraries
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/buildsystems/vcpkg.cmake | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/scripts/buildsystems/vcpkg.cmake b/scripts/buildsystems/vcpkg.cmake index 55516b1f7..d721bbafa 100644 --- a/scripts/buildsystems/vcpkg.cmake +++ b/scripts/buildsystems/vcpkg.cmake @@ -503,14 +503,17 @@ endfunction() # DESTINATION - the runtime directory for those targets (usually `bin`) function(x_vcpkg_install_local_dependencies) if(_VCPKG_TARGET_TRIPLET_PLAT MATCHES "windows|uwp") - cmake_parse_arguments(PARSE_ARGV __VCPKG_APPINSTALL "" "DESTINATION" "TARGETS") + cmake_parse_arguments(PARSE_ARGV 0 __VCPKG_APPINSTALL "" "DESTINATION" "TARGETS") _vcpkg_set_powershell_path() foreach(TARGET IN LISTS __VCPKG_APPINSTALL_TARGETS) - install(CODE "message(\"-- Installing app dependencies for ${TARGET}...\") - execute_process(COMMAND \"${_VCPKG_POWERSHELL_PATH}\" -noprofile -executionpolicy Bypass -file \"${_VCPKG_TOOLCHAIN_DIR}/msbuild/applocal.ps1\" - -targetBinary \"\${CMAKE_INSTALL_PREFIX}/${__VCPKG_APPINSTALL_DESTINATION}/$<TARGET_FILE_NAME:${TARGET}>\" - -installedDir \"${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}$<$<CONFIG:Debug>:/debug>/bin\" - -OutVariable out)") + get_target_property(TARGETTYPE ${TARGET} TYPE) + if(NOT TARGETTYPE STREQUAL "INTERFACE_LIBRARY") + install(CODE "message(\"-- Installing app dependencies for ${TARGET}...\") + execute_process(COMMAND \"${_VCPKG_POWERSHELL_PATH}\" -noprofile -executionpolicy Bypass -file \"${_VCPKG_TOOLCHAIN_DIR}/msbuild/applocal.ps1\" + -targetBinary \"\${CMAKE_INSTALL_PREFIX}/${__VCPKG_APPINSTALL_DESTINATION}/$<TARGET_FILE_NAME:${TARGET}>\" + -installedDir \"${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}$<$<CONFIG:Debug>:/debug>/bin\" + -OutVariable out)") + endif() endforeach() endif() endfunction() |