diff options
| author | Philipp Andreas <github@smurfy.de> | 2014-07-12 09:29:47 +0200 |
|---|---|---|
| committer | Philipp Andreas <github@smurfy.de> | 2014-07-12 09:30:49 +0200 |
| commit | 2101baf2911d7965c86e5308e4d8350790a6956c (patch) | |
| tree | 2acb875cabca055797620458baad26d5f8612105 /daemon/daemon.pro | |
| parent | 959e251f2336e21d3615b1525a38773fe58ab2e7 (diff) | |
| parent | 84e775d768f0675ee733132b3762db647f1409ac (diff) | |
Merge branch 'master' into notifications
Conflicts:
daemon/manager.cpp
Diffstat (limited to 'daemon/daemon.pro')
| -rw-r--r-- | daemon/daemon.pro | 31 |
1 files changed, 28 insertions, 3 deletions
diff --git a/daemon/daemon.pro b/daemon/daemon.pro index 2c4894a..e52e8e8 100644 --- a/daemon/daemon.pro +++ b/daemon/daemon.pro @@ -1,7 +1,6 @@ TARGET = pebbled CONFIG += console -CONFIG -= app_bundle CONFIG += link_pkgconfig QT -= gui @@ -9,6 +8,10 @@ QT += bluetooth dbus contacts PKGCONFIG += commhistory-qt5 mlite5 QMAKE_CXXFLAGS += -std=c++0x +LIBS += -L$$OUT_PWD/../ext/Log4Qt/ -llog4qt +QMAKE_RPATHDIR += /usr/share/pebble/lib +INCLUDEPATH += ../ext/Log4Qt/src ../ext/Log4Qt/deploy/include + SOURCES += \ daemon.cpp \ manager.cpp \ @@ -28,11 +31,33 @@ HEADERS += \ dbusadaptor.h \ notificationmanager.h -INSTALLS += target pebbled +OTHER_FILES += \ + org.pebbled.xml \ + ../log4qt-debug.conf \ + ../log4qt-release.conf + +INSTALLS += target pebbled confile lib target.path = /usr/bin pebbled.files = $${TARGET}.service pebbled.path = /usr/lib/systemd/user -OTHER_FILES += org.pebbled.xml +CONFIG(debug, debug|release) { + message(Debug build) + confile.extra = cp $$PWD/../log4qt-debug.conf $$OUT_PWD/../log4qt.conf +} +else { + message(Release build) + confile.extra = cp $$PWD/../log4qt-release.conf $$OUT_PWD/../log4qt.conf +} + +confile.files = $$OUT_PWD/../log4qt.conf +confile.path = /usr/share/pebble + +lib.files += $$OUT_PWD/../ext/Log4Qt/*.s* +lib.path = /usr/share/pebble/lib + +# so QtCreator could find commhistory headers... :-( +INCLUDEPATH += $$[QT_HOST_PREFIX]/include/commhistory-qt5 +INCLUDEPATH += $$[QT_HOST_PREFIX]/include/mlite5 |