Merge branch 'kyoto'

Conflicts:
	common/storage.h
	common/storage_lmdb.cpp
	dummyresource/facade.cpp
	store/test/CMakeLists.txt
	tests/storagebenchmark.cpp

1 files changed, 17 insertions, 0 deletions

diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
new file mode 100644
index 0000000..1629acb
--- /dev/null
+++ b/tests/CMakeLists.txt
@@ -0,0 +1,17 @@
+set(CMAKE_AUTOMOC ON)
+include_directories(${CMAKE_CURRENT_BINARY_DIR})
+
+generate_flatbuffers(calendar)
+
+macro(manual_tests)
+    foreach(_testname ${ARGN})
+        add_executable(${_testname} ${_testname}.cpp)
+        qt5_use_modules(${_testname} Core Test Concurrent)
+        target_link_libraries(${_testname} akonadinextcommon)
+    endforeach(_testname)
+endmacro(manual_tests)
+
+manual_tests (
+    storagebenchmark
+    storagetest
+)