1 files changed, 22 insertions, 16 deletions

diff --git a/common/CMakeLists.txt b/common/CMakeLists.txt
index f6847a7..2ece210 100644
--- a/common/CMakeLists.txt
+++ b/common/CMakeLists.txt
@@ -1,19 +1,6 @@
+include_directories(${CMAKE_CURRENT_BINARY_DIR})
+
 project(akonadi2common)
-generate_flatbuffers(
-    commands/commandcompletion
-    commands/createentity
-    commands/deleteentity
-    commands/fetchentity
-    commands/handshake
-    commands/modifyentity
-    commands/revisionupdate
-    commands/synchronize
-    commands/notification
-    domain/event
-    entity
-    metadata
-    queuedcommand
-)
 
 if (STORAGE_unqlite)
     add_definitions(-DUNQLITE_ENABLE_THREADS -fpermissive)
@@ -41,8 +28,27 @@ set(command_SRCS
     ${storage_SRCS})
 
 add_library(${PROJECT_NAME} SHARED ${command_SRCS})
+
+generate_flatbuffers(
+    ${PROJECT_NAME}
+
+    commands/commandcompletion
+    commands/createentity
+    commands/deleteentity
+    commands/fetchentity
+    commands/handshake
+    commands/modifyentity
+    commands/revisionupdate
+    commands/synchronize
+    commands/notification
+    domain/event
+    entity
+    metadata
+    queuedcommand
+)
+
 generate_export_header(${PROJECT_NAME} BASE_NAME Akonadi2Common EXPORT_FILE_NAME akonadi2common_export.h)
 SET_TARGET_PROPERTIES(${PROJECT_NAME} PROPERTIES LINKER_LANGUAGE CXX)
 qt5_use_modules(${PROJECT_NAME} Network)
-target_link_libraries(${PROJECT_NAME} ${storage_LIBS} akonadi2async)
+target_link_libraries(${PROJECT_NAME} ${storage_LIBS} KF5::Async)
 install(TARGETS ${PROJECT_NAME} ${KDE_INSTALL_TARGETS_DEFAULT_ARGS})