diff options
| author | Andrei Lebedev <lebdron@gmail.com> | 2019-05-19 14:41:03 +0300 |
|---|---|---|
| committer | Andrei Lebedev <lebdron@gmail.com> | 2019-05-19 14:41:03 +0300 |
| commit | b395438c791ca9f78e383a1d571525eee785e67c (patch) | |
| tree | 4aaba68a88a95633f77e944a36081441b3daef6a /scripts | |
| parent | 5495513ef45eb97d8453d15007714f1b4d3391f9 (diff) | |
| parent | 030e74940cc40db2415700e87e3b2c8aeeee8108 (diff) | |
| download | vcpkg-b395438c791ca9f78e383a1d571525eee785e67c.tar.gz vcpkg-b395438c791ca9f78e383a1d571525eee785e67c.zip | |
Merge branch 'master' into openssl-unix-dynamic
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/buildsystems/vcpkg.cmake | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/scripts/buildsystems/vcpkg.cmake b/scripts/buildsystems/vcpkg.cmake index 4c3dad309..2844db884 100644 --- a/scripts/buildsystems/vcpkg.cmake +++ b/scripts/buildsystems/vcpkg.cmake @@ -169,6 +169,7 @@ function(add_executable name) _add_executable(${ARGV}) list(FIND ARGV "IMPORTED" IMPORTED_IDX) list(FIND ARGV "ALIAS" ALIAS_IDX) + list(FIND ARGV "MACOSX_BUNDLE" MACOSX_BUNDLE_IDX) if(IMPORTED_IDX EQUAL -1 AND ALIAS_IDX EQUAL -1) if(VCPKG_APPLOCAL_DEPS) if(_VCPKG_TARGET_TRIPLET_PLAT MATCHES "windows|uwp") @@ -179,7 +180,7 @@ function(add_executable name) -OutVariable out ) elseif(_VCPKG_TARGET_TRIPLET_PLAT MATCHES "osx") - if ("MACOSX_BUNDLE" IN_LIST ARGV) + if (NOT MACOSX_BUNDLE_IDX EQUAL -1) add_custom_command(TARGET ${name} POST_BUILD COMMAND python ${_VCPKG_TOOLCHAIN_DIR}/osx/applocal.py $<TARGET_FILE:${name}> |