summaryrefslogtreecommitdiff
path: root/daemon/daemon.pro
diff options
context:
space:
mode:
authorTomasz Sterna <tomek@xiaoka.com>2014-07-11 23:31:28 +0200
committerTomasz Sterna <tomek@xiaoka.com>2014-07-11 23:31:28 +0200
commit6a8cdaf2f718fef8a826fd98241050a7d3cbfb3d (patch)
tree46a5d8db858b45d633b72a74f8a7ce011ec3cbe9 /daemon/daemon.pro
parentefb33d6494d88c27c8766553b6a963ddf2654458 (diff)
Use Log4Qt in daemon
Diffstat (limited to 'daemon/daemon.pro')
-rw-r--r--daemon/daemon.pro16
1 files changed, 9 insertions, 7 deletions
diff --git a/daemon/daemon.pro b/daemon/daemon.pro
index aca65f1..9d1a441 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
@@ -10,7 +9,7 @@ PKGCONFIG += commhistory-qt5 mlite5
QMAKE_CXXFLAGS += -std=c++0x
LIBS += -L$$OUT_PWD/../ext/Log4Qt/ -llog4qt
-QMAKE_RPATHDIR += /usr/share/$$TARGET/lib
+QMAKE_RPATHDIR += /usr/share/pebble/lib
INCLUDEPATH += ../ext/Log4Qt/src ../ext/Log4Qt/deploy/include
SOURCES += \
@@ -35,7 +34,7 @@ OTHER_FILES += \
../log4qt-debug.conf \
../log4qt-release.conf
-INSTALLS += target pebbled config
+INSTALLS += target pebbled confile lib
target.path = /usr/bin
@@ -44,15 +43,18 @@ pebbled.path = /usr/lib/systemd/user
CONFIG(debug, debug|release) {
message(Debug build)
- log4qt_demo_config.extra = cp $$PWD/../../log4qt-debug.conf $$OUT_PWD/../../log4qt.conf
+ confile.extra = cp $$PWD/../log4qt-debug.conf $$OUT_PWD/../log4qt.conf
}
else {
message(Release build)
- log4qt_demo_config.extra = cp $$PWD/../../log4qt-release.conf $$OUT_PWD/../../log4qt.conf
+ confile.extra = cp $$PWD/../log4qt-release.conf $$OUT_PWD/../log4qt.conf
}
-config.files = $$OUT_PWD/../../log4qt.conf
-config.path = /usr/share/$$TARGET
+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