diff options
| author | Carsten Rudolph <18394207+Aschratt@users.noreply.github.com> | 2021-02-08 22:59:37 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-08 13:59:37 -0800 |
| commit | 66ffe4d7e194b168cfb7ba89c4237f10665b6535 (patch) | |
| tree | 266b8a0ec732276bba4a70292b565ca472c3d7df /scripts | |
| parent | 115c45d8031c9820d189922897768cc550c5ad36 (diff) | |
| download | vcpkg-66ffe4d7e194b168cfb7ba89c4237f10665b6535.tar.gz vcpkg-66ffe4d7e194b168cfb7ba89c4237f10665b6535.zip | |
[vcpkg] Added support for additional `install` modifiers in X_VCPKG_APPLOCAL_DEPS_INSTALL. (#16095)
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 7c9da5e25..1ab9d033e 100644 --- a/scripts/buildsystems/vcpkg.cmake +++ b/scripts/buildsystems/vcpkg.cmake @@ -562,12 +562,12 @@ if(X_VCPKG_APPLOCAL_DEPS_INSTALL) set(MODIFIER "") # Modifier for the command in the argument set(LAST_COMMAND "") # Last command we found to process foreach(ARG ${ARGN}) - if(ARG MATCHES "ARCHIVE|LIBRARY|RUNTIME|OBJECTS|FRAMEWORK|BUNDLE|PRIVATE_HEADER|PUBLIC_HEADER|RESOURCE") + if(ARG MATCHES "ARCHIVE|LIBRARY|RUNTIME|OBJECTS|FRAMEWORK|BUNDLE|PRIVATE_HEADER|PUBLIC_HEADER|RESOURCE|INCLUDES") set(MODIFIER ${ARG}) continue() endif() - if(ARG MATCHES "TARGETS|DESTINATION|PERMISSIONS|CONFIGURATIONS|COMPONENT|NAMELINK_COMPONENT|OPTIONAL|EXCLUDE_FROM_ALL|NAMELINK_ONLY|NAMELINK_SKIP") + if(ARG MATCHES "TARGETS|DESTINATION|PERMISSIONS|CONFIGURATIONS|COMPONENT|NAMELINK_COMPONENT|OPTIONAL|EXCLUDE_FROM_ALL|NAMELINK_ONLY|NAMELINK_SKIP|EXPORT") set(LAST_COMMAND ${ARG}) continue() endif() |