diff options
| author | Sean Warren <s.warren@garvan.org.au> | 2019-05-17 06:24:03 +1000 |
|---|---|---|
| committer | Victor Romero <romerosanchezv@gmail.com> | 2019-05-16 13:24:02 -0700 |
| commit | 031e494970035f6c09725a6433eb2adefb09d683 (patch) | |
| tree | 64783139a912940f3d297d778f82f9359dcd8757 /scripts/buildsystems/vcpkg.cmake | |
| parent | 9238e93cc32555ad7c5239376d31796e949e16da (diff) | |
| download | vcpkg-031e494970035f6c09725a6433eb2adefb09d683.tar.gz vcpkg-031e494970035f6c09725a6433eb2adefb09d683.zip | |
Add mac applocal for bundling dependencies (#5681)
Diffstat (limited to 'scripts/buildsystems/vcpkg.cmake')
| -rw-r--r-- | scripts/buildsystems/vcpkg.cmake | 24 |
1 files changed, 17 insertions, 7 deletions
diff --git a/scripts/buildsystems/vcpkg.cmake b/scripts/buildsystems/vcpkg.cmake index 53d61cf6b..4c3dad309 100644 --- a/scripts/buildsystems/vcpkg.cmake +++ b/scripts/buildsystems/vcpkg.cmake @@ -170,13 +170,23 @@ function(add_executable name) list(FIND ARGV "IMPORTED" IMPORTED_IDX) list(FIND ARGV "ALIAS" ALIAS_IDX) if(IMPORTED_IDX EQUAL -1 AND ALIAS_IDX EQUAL -1) - if(VCPKG_APPLOCAL_DEPS AND _VCPKG_TARGET_TRIPLET_PLAT MATCHES "windows|uwp") - add_custom_command(TARGET ${name} POST_BUILD - COMMAND powershell -noprofile -executionpolicy Bypass -file ${_VCPKG_TOOLCHAIN_DIR}/msbuild/applocal.ps1 - -targetBinary $<TARGET_FILE:${name}> - -installedDir "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}$<$<CONFIG:Debug>:/debug>/bin" - -OutVariable out - ) + if(VCPKG_APPLOCAL_DEPS) + if(_VCPKG_TARGET_TRIPLET_PLAT MATCHES "windows|uwp") + add_custom_command(TARGET ${name} POST_BUILD + COMMAND powershell -noprofile -executionpolicy Bypass -file ${_VCPKG_TOOLCHAIN_DIR}/msbuild/applocal.ps1 + -targetBinary $<TARGET_FILE:${name}> + -installedDir "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}$<$<CONFIG:Debug>:/debug>/bin" + -OutVariable out + ) + elseif(_VCPKG_TARGET_TRIPLET_PLAT MATCHES "osx") + if ("MACOSX_BUNDLE" IN_LIST ARGV) + add_custom_command(TARGET ${name} POST_BUILD + COMMAND python ${_VCPKG_TOOLCHAIN_DIR}/osx/applocal.py + $<TARGET_FILE:${name}> + "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}$<$<CONFIG:Debug>:/debug>" + ) + endif() + endif() endif() set_target_properties(${name} PROPERTIES VS_USER_PROPS do_not_import_user.props) set_target_properties(${name} PROPERTIES VS_GLOBAL_VcpkgEnabled false) |