diff options
| author | Sean Warren <s.warren@garvan.org.au> | 2019-05-19 16:33:16 +1000 |
|---|---|---|
| committer | Robert Schumacher <roschuma@microsoft.com> | 2019-05-18 23:33:16 -0700 |
| commit | 84e19f1ce21ba3173647d15c7f413683389c6dba (patch) | |
| tree | 4a900ad5d209166d99988e6de1e210c95d282118 /scripts | |
| parent | 69e86fd2013e0c495cc4e61500e794548b62ae03 (diff) | |
| download | vcpkg-84e19f1ce21ba3173647d15c7f413683389c6dba.tar.gz vcpkg-84e19f1ce21ba3173647d15c7f413683389c6dba.zip | |
[vcpkg.cmake] Remove use of IN_LIST (#6521)
Fixes regression introduced by #5681 in CMake projects with minimum version <3.3 where CMP0057 is not set to NEW
Fixes #6484
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}> |