Merge branch 'kyoto'

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

1 files changed, 11 insertions, 1 deletions

diff --git a/common/CMakeLists.txt b/common/CMakeLists.txt
index d409828..9b3f777 100644
--- a/common/CMakeLists.txt
+++ b/common/CMakeLists.txt
@@ -2,10 +2,20 @@ project(akonadinextcommon)
 generate_flatbuffers(commands/handshake
                      commands/revisionupdate)
 
+if (STORAGE_KYOTO)
+    set(storage_SRCS storage_kyoto.cpp)
+    set(storage_LIBS kyotocabinet)
+else (STORAGE_KYOTO)
+    set(storage_SRCS storage_lmdb.cpp)
+    set(storage_LIBS lmdb)
+endif (STORAGE_KYOTO)
+
 set(command_SRCS
    commands.cpp
    console.cpp
-   ${CMAKE_CURRENT_BINARY_DIR}/commands/handshake_generated.h)
+   ${storage_SRCS})
 
 add_library(${PROJECT_NAME} ${command_SRCS})
+SET_TARGET_PROPERTIES(${PROJECT_NAME} PROPERTIES LINKER_LANGUAGE CXX)
 qt5_use_modules(${PROJECT_NAME} Widgets)
+target_link_libraries(${PROJECT_NAME} ${storage_LIBS})