summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexandru Croitor <alexandru.croitor@qt.io>2020-01-29 15:54:38 +0100
committerAlexandru Croitor <alexandru.croitor@qt.io>2020-01-29 15:11:58 +0000
commit274a61d0966e96f66ec9f0fd63f67966b28bf212 (patch)
tree39b9d5e4519e19a40316e4404fe2e937d13925ca
parentccdc6c2dd3d4b7e7b6a06488c278e4c9f06e8925 (diff)
Skip processing '-framework' flags in qt6_generate_meta_types_dep_file
Otherwise we get generation errors due to calling GENEX_EVAL on something that is an invalid target. Perhaps there will be a better way once https://gitlab.kitware.com/cmake/cmake/issues/20287 is fixed. Change-Id: I6af9511cbb9942b9edbc3b3fc7028936308715d8 Reviewed-by: Leander Beernaert <leander.beernaert@qt.io> Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
-rw-r--r--src/corelib/Qt6CoreMacros.cmake4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/corelib/Qt6CoreMacros.cmake b/src/corelib/Qt6CoreMacros.cmake
index 668fc66d63..3857d46b36 100644
--- a/src/corelib/Qt6CoreMacros.cmake
+++ b/src/corelib/Qt6CoreMacros.cmake
@@ -630,6 +630,10 @@ function(qt6_generate_meta_types_dep_file target dep_file dep_file_install)
set(gen_exp "")
set(gen_exp_install "")
foreach(dep IN LISTS link_dependencies)
+ # Skip over any flags starting with -, like -framework or -lboo.
+ if("${dep}" MATCHES "^-")
+ continue()
+ endif()
# replace LINK_ONLY with true, or we will get an error evaluating that
# generator expression
string(REPLACE "$<LINK_ONLY:" "$<1:" genex_target "$<GENEX_EVAL:${dep}>")