diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-06-03 18:36:48 +0200 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-06-04 23:21:21 +0200 |
| commit | c254254c55b24dd0653331e025cdfdbbdcca2a56 (patch) | |
| tree | 508075dfac8770de0c7d96461e2a5b0b335278a6 /cmake/QtFinishPrlFile.cmake | |
| parent | 3ffad972c11f420157b0d89260edad2d45f51f2b (diff) | |
CMake: Fix qmake mixing for framework builds
Include headers in .pri files should point to the framework Headers
dirs.
The module name in the .pri file is not versioned when it's a bundle.
Paths to system frameworks in .prl files should instead be replaced
with -framework Foo flags.
Change-Id: Ia353d033799fae40a1bc55fad6f86b2c8ef76c56
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
Diffstat (limited to 'cmake/QtFinishPrlFile.cmake')
| -rw-r--r-- | cmake/QtFinishPrlFile.cmake | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cmake/QtFinishPrlFile.cmake b/cmake/QtFinishPrlFile.cmake index 2edc8bdd9c..e584beb06b 100644 --- a/cmake/QtFinishPrlFile.cmake +++ b/cmake/QtFinishPrlFile.cmake @@ -41,7 +41,7 @@ foreach(line ${lines}) list(APPEND adjusted_libs "$$[QT_INSTALL_LIBS/get]/${relative_lib}") endif() else() - if(NOT lib MATCHES "^-l") + if(NOT lib MATCHES "^-l" AND NOT lib MATCHES "^-framework") string(PREPEND lib "-l") endif() list(APPEND adjusted_libs "${lib}") |