Skip to content

Commit

Permalink
Fix MythZoneMinder on mac; the proper way..
Browse files Browse the repository at this point in the history
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
  • Loading branch information
jyavenard committed Mar 4, 2012
1 parent 30ed8f0 commit a5557a3
Showing 1 changed file with 3 additions and 5 deletions.
8 changes: 3 additions & 5 deletions mythplugins/mythzoneminder/mythzmserver/mythzmserver.pro
Expand Up @@ -10,17 +10,15 @@ target.path = $${PREFIX}/bin

INSTALLS = target

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

linux: DEFINES += linux

Expand Down

0 comments on commit a5557a3

Please sign in to comment.