diff --git a/guh.pro b/guh.pro index 0823fee5..b1578f28 100644 --- a/guh.pro +++ b/guh.pro @@ -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 diff --git a/tests/auto/autotests.pri b/tests/auto/autotests.pri index e0d31424..8ab41c87 100644 --- a/tests/auto/autotests.pri +++ b/tests/auto/autotests.pri @@ -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 \ diff --git a/tests/libguh-core/libguh-core.pro b/tests/libguh-core/libguh-core.pro index 65bee647..0bafd170 100644 --- a/tests/libguh-core/libguh-core.pro +++ b/tests/libguh-core/libguh-core.pro @@ -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