From 9ee8378d393778ac67314be7ea8d5bcbaeee9ee0 Mon Sep 17 00:00:00 2001 From: Aaron Seigo Date: Sun, 7 Dec 2014 10:08:07 +0100 Subject: try out unqlite --- common/CMakeLists.txt | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'common/CMakeLists.txt') diff --git a/common/CMakeLists.txt b/common/CMakeLists.txt index 2fef5f6..3baf6b6 100644 --- a/common/CMakeLists.txt +++ b/common/CMakeLists.txt @@ -2,9 +2,8 @@ project(akonadi2common) generate_flatbuffers(commands/handshake commands/revisionupdate) -if (STORAGE_KYOTO) - set(storage_SRCS storage_kyoto.cpp) - set(storage_LIBS kyotocabinet) +if (STORAGE_unqlite) + set(storage_SRCS storage_unqlite.cpp unqlite/*c) else (STORAGE_KYOTO) set(storage_SRCS storage_lmdb.cpp) set(storage_LIBS lmdb) -- cgit v1.2.3 From 8969c46cf96884c7304a01b8b7822c1936ab215e Mon Sep 17 00:00:00 2001 From: Aaron Seigo Date: Sun, 14 Dec 2014 10:23:44 +0100 Subject: build unqlite with thread support --- common/CMakeLists.txt | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'common/CMakeLists.txt') diff --git a/common/CMakeLists.txt b/common/CMakeLists.txt index 3baf6b6..8e8af1f 100644 --- a/common/CMakeLists.txt +++ b/common/CMakeLists.txt @@ -3,6 +3,7 @@ generate_flatbuffers(commands/handshake commands/revisionupdate) if (STORAGE_unqlite) + add_definitions(-DUNQLITE_ENABLE_THREADS) set(storage_SRCS storage_unqlite.cpp unqlite/*c) else (STORAGE_KYOTO) set(storage_SRCS storage_lmdb.cpp) @@ -10,10 +11,10 @@ else (STORAGE_KYOTO) endif (STORAGE_KYOTO) set(command_SRCS - commands.cpp - console.cpp - storage_common.cpp - ${storage_SRCS}) + commands.cpp + console.cpp + storage_common.cpp + ${storage_SRCS}) add_library(${PROJECT_NAME} ${command_SRCS}) SET_TARGET_PROPERTIES(${PROJECT_NAME} PROPERTIES LINKER_LANGUAGE CXX) -- cgit v1.2.3 From a6ed70495f9f3ecb21c26860dda16aadcdc91c3a Mon Sep 17 00:00:00 2001 From: Aaron Seigo Date: Sun, 14 Dec 2014 11:59:39 +0100 Subject: and now unqlite storage works --- common/CMakeLists.txt | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'common/CMakeLists.txt') diff --git a/common/CMakeLists.txt b/common/CMakeLists.txt index 8e8af1f..a2fd57a 100644 --- a/common/CMakeLists.txt +++ b/common/CMakeLists.txt @@ -4,11 +4,12 @@ generate_flatbuffers(commands/handshake if (STORAGE_unqlite) add_definitions(-DUNQLITE_ENABLE_THREADS) - set(storage_SRCS storage_unqlite.cpp unqlite/*c) -else (STORAGE_KYOTO) + file(GLOB storage_SRCS unqlite/*c) + set(storage_SRCS ${storage_SRCS} storage_unqlite.cpp) +else (STORAGE_unqlite) set(storage_SRCS storage_lmdb.cpp) set(storage_LIBS lmdb) -endif (STORAGE_KYOTO) +endif (STORAGE_unqlite) set(command_SRCS commands.cpp @@ -16,6 +17,7 @@ set(command_SRCS storage_common.cpp ${storage_SRCS}) +message("We have: ${storage_SRCS}") add_library(${PROJECT_NAME} ${command_SRCS}) SET_TARGET_PROPERTIES(${PROJECT_NAME} PROPERTIES LINKER_LANGUAGE CXX) qt5_use_modules(${PROJECT_NAME} Widgets) -- cgit v1.2.3