Add forward headers and use them in the tests.

svn path=/branches/work/~ervin/qtjolie/; revision=959038
This commit is contained in:
Kevin Ottens 2009-04-25 14:06:25 +00:00
parent e3a59c40e2
commit 1ceabde6ea
15 changed files with 34 additions and 15 deletions

View File

@ -3,7 +3,8 @@ include(KDE4Defaults)
include(MacroLibrary)
add_definitions(${QT_DEFINITIONS} ${KDE4_DEFINITIONS})
include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${KDE4_INCLUDES})
#include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${KDE4_INCLUDES})
add_subdirectory(qtjolie)
add_subdirectory(includes)
add_subdirectory(tests)

View File

@ -0,0 +1,7 @@
install( FILES
QtJolie/Client
QtJolie/Fault
QtJolie/Message
QtJolie/PendingCall
QtJolie/Value
DESTINATION ${INCLUDE_INSTALL_DIR}/QtJolie COMPONENT Devel)

View File

@ -0,0 +1,2 @@
#include "../qtjolie/client.h"

View File

@ -0,0 +1,2 @@
#include "../qtjolie/fault.h"

View File

@ -0,0 +1,2 @@
#include "../qtjolie/message.h"

View File

@ -0,0 +1,2 @@
#include "../qtjolie/pendingcall.h"

View File

@ -0,0 +1,2 @@
#include "../qtjolie/value.h"

View File

@ -1,6 +1,7 @@
project(QtJolie)
include_directories(${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_SOURCE_DIR}/../
${CMAKE_CURRENT_BINARY_DIR}
${QT_INCLUDE_DIR})

View File

@ -1,4 +1,4 @@
include_directories(${KDE4_INCLUDES} ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/../)
include_directories(${KDE4_INCLUDES} ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/../includes ${CMAKE_CURRENT_SOURCE_DIR}/../)
MACRO(SODEP_UNIT_TESTS)
FOREACH(_testname ${ARGN})

View File

@ -21,7 +21,7 @@
#include <QtCore/QObject>
#include <QtTest/QtTest>
#include <qtjolie/fault.h>
#include <QtJolie/Fault>
#include "testhelpers.h"
using namespace Jolie;

View File

@ -23,10 +23,10 @@
#include <QtTest/QtTest>
#include <qtjolie/fault.h>
#include <qtjolie/message.h>
#include <qtjolie/value.h>
#include <qtjolie/sodephelpers_p.h>
#include <QtJolie/Fault>
#include <QtJolie/Message>
#include <QtJolie/Value>
#include "../qtjolie/sodephelpers_p.h"
Q_DECLARE_METATYPE(Jolie::Value);

View File

@ -21,7 +21,7 @@
#include <QtCore/QObject>
#include <QtTest/QtTest>
#include <qtjolie/message.h>
#include <QtJolie/Message>
#include "testhelpers.h"
using namespace Jolie;

View File

@ -22,9 +22,9 @@
#include <QtCore/QProcess>
#include <QtTest/QtTest>
#include <qtjolie/client.h>
#include <qtjolie/message.h>
#include <qtjolie/pendingcall.h>
#include <QtJolie/Client>
#include <QtJolie/Message>
#include <QtJolie/PendingCall>
#include "testhelpers.h"
#ifndef DATA_DIR

View File

@ -25,9 +25,9 @@
#include <QtGui/QPushButton>
#include <QtNetwork/QTcpSocket>
#include <qtjolie/message.h>
#include <qtjolie/value.h>
#include <qtjolie/sodephelpers_p.h>
#include <QtJolie/Message>
#include <QtJolie/Value>
#include "../qtjolie/sodephelpers_p.h"
using namespace Jolie;

View File

@ -21,7 +21,7 @@
#include <QtCore/QObject>
#include <QtTest/QtTest>
#include <qtjolie/value.h>
#include <QtJolie/Value>
#include "testhelpers.h"