Skip to content

Commit 0fc9853

Browse files
committed
Fix MythZoneMinder on mac; the proper way..
Following 6e2f231, it turns out, qmake has a different behaviour between adding to the LIBS variable (elements stays escaped) and QMAKE_LFLAGS (elements are un-escpade properly). Compiler flags generated from running mysql-config should have been added to QMAKE_LFLAGS anyway. So use it
1 parent 79f5133 commit 0fc9853

File tree

1 file changed

+3
-5
lines changed

1 file changed

+3
-5
lines changed

mythplugins/mythzoneminder/mythzmserver/mythzmserver.pro

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,17 +10,15 @@ target.path = $${PREFIX}/bin
1010

1111
INSTALLS = target
1212

13+
MYSQLIBS = $$quote($$system(mysql_config --libs))
1314
macx {
1415
CONFIG += qt
1516
QT += sql
1617
#Can't use mysql_config output, as it could have been compiled with
1718
# universal support, and we may want just 32 or 64 bits
18-
MYSQLIBS = "$$system(mysql_config --libs)"
1919
MYSQLIBS ~= s/-arch +[a-z0-9_]+//g
20-
LIBS += $$sprintf($$MYSQLIBS)
21-
} else {
22-
LIBS += $$system(mysql_config --libs)
23-
}
20+
}
21+
QMAKE_LFLAGS += $$MYSQLIBS
2422

2523
linux: DEFINES += linux
2624

0 commit comments

Comments
 (0)