AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Strip the -L dirs when processing GL dirs for the CMake files.

Browse Source 
The generated cmake files expect only the names of libraries, so the
existence of directories causes erroneous fatal errors when attempting
to use Qt5Gui, if pkg-config returns a -L entry from

 pkg-config --libs egl

Change-Id: Iec50b4be68ab643c3c02abce2435a98e69955138
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
Reviewed-by: Iikka Eklund <iikka.eklund@digia.com>
This commit is contained in:
Stephen Kelly 2013-06-05 14:26:03 +02:00 committed by The Qt Project
parent 930dc240d1
commit 04830dbcb2
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mkspecs/features/cmake_functions.prf
View File

@ -54,7 +54,7 @@ defineReplace(cmakeProcessLibs) {
variable = $$1 variable = $$1
out = out =
for(v, variable) { for(v, variable) {
if(!equals(v, -framework)) { if(!equals(v, -framework):!equals(v, -L.*)) {
v ~= s,^-l,, v ~= s,^-l,,
v ~= s,^-lib,, v ~= s,^-lib,,
v ~= s,.lib$,, v ~= s,.lib$,,