From 6ca6273427fe939080aba15349dcc380c44d1c3f Mon Sep 17 00:00:00 2001 From: Aaron Seigo Date: Mon, 15 Dec 2014 07:30:08 +0100 Subject: make libhawd a shared lib --- tests/CMakeLists.txt | 2 +- tests/hawd/CMakeLists.txt | 3 ++- tests/hawd/dataset.h | 3 ++- tests/hawd/datasetdefinition.h | 6 ++++-- tests/hawd/state.h | 3 ++- 5 files changed, 11 insertions(+), 6 deletions(-) (limited to 'tests') 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 @@ add_subdirectory(hawd) set(CMAKE_AUTOMOC ON) -include_directories(${CMAKE_CURRENT_BINARY_DIR}) +include_directories(${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR}/hawd) generate_flatbuffers(calendar) 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 modules/print.cpp ) -add_library(libhawd ${lib_SRCS}) +add_library(libhawd SHARED ${lib_SRCS}) +generate_export_header(libhawd BASE_NAME HAWD EXPORT_FILE_NAME hawd_export.h) qt5_use_modules(libhawd Core) target_link_libraries(libhawd akonadi2common ${LIBGIT2_LIBRARIES}) install(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 @@ #include "datasetdefinition.h" +#include "hawd_export.h" #include "state.h" #include "common/storage.h" @@ -30,7 +31,7 @@ namespace HAWD { -class Dataset +class HAWD_EXPORT Dataset { public: 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 @@ #include #include +#include "hawd_export.h" + namespace HAWD { -class DataDefinition +class HAWD_EXPORT DataDefinition { public: 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: int m_max; }; -class DatasetDefinition +class HAWD_EXPORT DatasetDefinition { public: 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 @@ #include #include "datasetdefinition.h" +#include "hawd_export.h" namespace HAWD { -class State +class HAWD_EXPORT State { public: State(const QString &configPath = QString()); -- cgit v1.2.3