ETM-Schurig
/
nymea
mirror of https://github.com/nymea/nymea.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix lib export for tests

pull/135/head
Simon Stürz 2015-10-30 16:14:51 +01:00 committed by Michael Zanetti
parent 3d470bc634
commit 285d66591a
3 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
guh.pro
View File

@ -30,7 +30,7 @@ doc.commands = cd $$top_srcdir/doc; qdoc config.qdocconf; cp images/logo.png htm
licensecheck.commands = $$top_srcdir/tests/auto/checklicenseheaders.sh $$top_srcdir
test.depends = licensecheck
test.commands = LD_LIBRARY_PATH=$$top_builddir/libguh make check
test.commands = LD_LIBRARY_PATH=$$top_builddir/libguh:$$top_builddir/tests/libguh-core make check
QMAKE_EXTRA_TARGETS += licensecheck doc test

2
tests/auto/autotests.pri
View File

@ -9,7 +9,7 @@ INCLUDEPATH += $$top_srcdir/server/ \
$$top_srcdir/tests/auto/
LIBS += -L$$top_builddir/libguh/ -lguh -L$$top_builddir/plugins/deviceplugins/mock/ \
-L$$top_builddir/tests/libguh-core -lguh-core
-L$$top_builddir/tests/libguh-core/ -lguh-core
SOURCES += ../guhtestbase.cpp \
../mocktcpserver.cpp \

10
tests/libguh-core/libguh-core.pro
View File

@ -4,12 +4,16 @@ include(../../server/server.pri)
TARGET = guh-core
TEMPLATE = lib
QT += sql
DEFINES += TESTING_ENABLED
INCLUDEPATH += $$top_srcdir/server/ $$top_srcdir/server/jsonrpc $$top_srcdir/libguh $$top_srcdir/tests/auto/
LIBS += -L$$top_builddir/libguh/ -lguh
INCLUDEPATH += $$top_srcdir/server/ \
$$top_srcdir/server/jsonrpc \
$$top_srcdir/libguh \
$$top_srcdir/tests/auto/
QT += sql
LIBS += -L$$top_builddir/libguh/ -lguh
target.path = /usr/lib
INSTALLS += target