diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-06-30 13:56:54 +0200 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-07-01 10:03:38 +0200 |
| commit | 868c7016e031b8a2b81c94cbfdaccf161ea9b549 (patch) | |
| tree | bb5733482d2efc1a74b65ff8bb652f5dd610d9f9 /cmake/QtGenerateLibPri.cmake | |
| parent | 1685b0540d60bc124bdfcfebf46a4e7c71f5db87 (diff) | |
CMake: Use correct framework link flags in scripts and .pri files
target_link_libraries expects a quoted string like
"-framework CoreFoundation" when linking frameworks and not 2
different arguments like "-framework" "CoreFoundation".
Fix that in the FindWrapOpenGL and FindGLESv2 find modules.
Make sure to not quote the framework link flags when generating
.pri files even if there are spaces, otherwise building apps
with qmake fails.
Amends 7fcc9cf05500fd3a0a1ba5c2f90a8ad3bcd8e5b0
Amends 2ed63e587eefb246dba9e69aa01fdb2abb2def13
Amends 55a15a1c1b93d36d705fc69e44b5c806b807dd55
Amends 2a767ab4bb7de8c29d2a8365212244ed944e9aeb
Task-number: QTBUG-85240
Change-Id: I66ba36760ad704d65e712072a528d9e25c336dfa
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Diffstat (limited to 'cmake/QtGenerateLibPri.cmake')
| -rw-r--r-- | cmake/QtGenerateLibPri.cmake | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cmake/QtGenerateLibPri.cmake b/cmake/QtGenerateLibPri.cmake index c7d6201e84..0e62536a1a 100644 --- a/cmake/QtGenerateLibPri.cmake +++ b/cmake/QtGenerateLibPri.cmake @@ -23,7 +23,7 @@ function(qmake_list out_var) # Surround values that contain spaces with double quotes. foreach(v ${ARGN}) - if(v MATCHES " ") + if(v MATCHES " " AND NOT MATCHES "^-framework") set(v "\"${v}\"") endif() list(APPEND result ${v}) |