summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--tests/CMakeLists.txt2
-rw-r--r--tests/hawd/CMakeLists.txt3
-rw-r--r--tests/hawd/dataset.h3
-rw-r--r--tests/hawd/datasetdefinition.h6
-rw-r--r--tests/hawd/state.h3
5 files changed, 11 insertions, 6 deletions
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 9087323..30db15e 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -1,7 +1,7 @@
1add_subdirectory(hawd) 1add_subdirectory(hawd)
2 2
3set(CMAKE_AUTOMOC ON) 3set(CMAKE_AUTOMOC ON)
4include_directories(${CMAKE_CURRENT_BINARY_DIR}) 4include_directories(${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR}/hawd)
5 5
6generate_flatbuffers(calendar) 6generate_flatbuffers(calendar)
7 7
diff --git a/tests/hawd/CMakeLists.txt b/tests/hawd/CMakeLists.txt
index 6400baf..271d14f 100644
--- a/tests/hawd/CMakeLists.txt
+++ b/tests/hawd/CMakeLists.txt
@@ -22,7 +22,8 @@ set(SRCS
22 modules/print.cpp 22 modules/print.cpp
23) 23)
24 24
25add_library(libhawd ${lib_SRCS}) 25add_library(libhawd SHARED ${lib_SRCS})
26generate_export_header(libhawd BASE_NAME HAWD EXPORT_FILE_NAME hawd_export.h)
26qt5_use_modules(libhawd Core) 27qt5_use_modules(libhawd Core)
27target_link_libraries(libhawd akonadi2common ${LIBGIT2_LIBRARIES}) 28target_link_libraries(libhawd akonadi2common ${LIBGIT2_LIBRARIES})
28install(TARGETS libhawd DESTINATION lib) 29install(TARGETS libhawd DESTINATION lib)
diff --git a/tests/hawd/dataset.h b/tests/hawd/dataset.h
index b91bc24..09a5828 100644
--- a/tests/hawd/dataset.h
+++ b/tests/hawd/dataset.h
@@ -21,6 +21,7 @@
21 21
22#include "datasetdefinition.h" 22#include "datasetdefinition.h"
23 23
24#include "hawd_export.h"
24#include "state.h" 25#include "state.h"
25#include "common/storage.h" 26#include "common/storage.h"
26 27
@@ -30,7 +31,7 @@
30namespace HAWD 31namespace HAWD
31{ 32{
32 33
33class Dataset 34class HAWD_EXPORT Dataset
34{ 35{
35public: 36public:
36 class Row 37 class Row
diff --git a/tests/hawd/datasetdefinition.h b/tests/hawd/datasetdefinition.h
index 21655a7..72ce0ec 100644
--- a/tests/hawd/datasetdefinition.h
+++ b/tests/hawd/datasetdefinition.h
@@ -23,10 +23,12 @@
23#include <QJsonObject> 23#include <QJsonObject>
24#include <QVariant> 24#include <QVariant>
25 25
26#include "hawd_export.h"
27
26namespace HAWD 28namespace HAWD
27{ 29{
28 30
29class DataDefinition 31class HAWD_EXPORT DataDefinition
30{ 32{
31public: 33public:
32 DataDefinition(const QString &name = QString(), QMetaType::Type type = QMetaType::Void, const QString &unit = QString(), int min = 0, int max = 0); 34 DataDefinition(const QString &name = QString(), QMetaType::Type type = QMetaType::Void, const QString &unit = QString(), int min = 0, int max = 0);
@@ -47,7 +49,7 @@ private:
47 int m_max; 49 int m_max;
48}; 50};
49 51
50class DatasetDefinition 52class HAWD_EXPORT DatasetDefinition
51{ 53{
52public: 54public:
53 DatasetDefinition(const QString &path); 55 DatasetDefinition(const QString &path);
diff --git a/tests/hawd/state.h b/tests/hawd/state.h
index fa76724..e321b41 100644
--- a/tests/hawd/state.h
+++ b/tests/hawd/state.h
@@ -23,11 +23,12 @@
23#include <QJsonObject> 23#include <QJsonObject>
24 24
25#include "datasetdefinition.h" 25#include "datasetdefinition.h"
26#include "hawd_export.h"
26 27
27namespace HAWD 28namespace HAWD
28{ 29{
29 30
30class State 31class HAWD_EXPORT State
31{ 32{
32public: 33public:
33 State(const QString &configPath = QString()); 34 State(const QString &configPath = QString());