1 files changed, 23 insertions, 14 deletions

diff --git a/common/CMakeLists.txt b/common/CMakeLists.txt
index a80ef95..fe72605 100644
--- a/common/CMakeLists.txt
+++ b/common/CMakeLists.txt
@@ -1,41 +1,45 @@
 include_directories(${CMAKE_CURRENT_BINARY_DIR})
 include_directories(domain)
 
-project(sinkcommon)
+project(sink)
 
-ecm_setup_version("0.1" VARIABLE_PREFIX SinkCommon
-                        VERSION_HEADER "${CMAKE_CURRENT_BINARY_DIR}/sinkcommon_version.h"
-                        PACKAGE_VERSION_FILE "${CMAKE_CURRENT_BINARY_DIR}/SinkCommonConfigVersion.cmake"
+ecm_setup_version("0.1" VARIABLE_PREFIX Sink
+                        VERSION_HEADER "${CMAKE_CURRENT_BINARY_DIR}/sink_version.h"
+                        PACKAGE_VERSION_FILE "${CMAKE_CURRENT_BINARY_DIR}/SinkConfigVersion.cmake"
                         SOVERSION 0
 )
 
 ########### CMake Config Files ###########
-set(CMAKECONFIG_INSTALL_DIR "${KDE_INSTALL_CMAKEPACKAGEDIR}/SinkCommon")
+set(CMAKECONFIG_INSTALL_DIR "${KDE_INSTALL_CMAKEPACKAGEDIR}/Sink")
 
 ecm_configure_package_config_file(
-  "${CMAKE_CURRENT_SOURCE_DIR}/SinkCommonConfig.cmake.in"
-  "${CMAKE_CURRENT_BINARY_DIR}/SinkCommonConfig.cmake"
+  "${CMAKE_CURRENT_SOURCE_DIR}/SinkConfig.cmake.in"
+  "${CMAKE_CURRENT_BINARY_DIR}/SinkConfig.cmake"
   INSTALL_DESTINATION  ${CMAKECONFIG_INSTALL_DIR}
 )
 
 install(FILES
-  "${CMAKE_CURRENT_BINARY_DIR}/SinkCommonConfig.cmake"
-  "${CMAKE_CURRENT_BINARY_DIR}/SinkCommonConfigVersion.cmake"
+  "${CMAKE_CURRENT_BINARY_DIR}/SinkConfig.cmake"
+  "${CMAKE_CURRENT_BINARY_DIR}/SinkConfigVersion.cmake"
   DESTINATION "${CMAKECONFIG_INSTALL_DIR}"
   COMPONENT Devel
 )
 
-install(EXPORT SinkCommonTargets DESTINATION "${CMAKECONFIG_INSTALL_DIR}" FILE SinkCommonTargets.cmake)
+add_definitions("-fvisibility=hidden")
+
+install(EXPORT SinkTargets DESTINATION "${CMAKECONFIG_INSTALL_DIR}" FILE SinkTargets.cmake)
 
 set(storage_SRCS storage_lmdb.cpp)
 set(storage_LIBS lmdb)
 
 set(command_SRCS
+    store.cpp
+    notifier.cpp
+    resourcecontrol.cpp
     modelresult.cpp
     definitions.cpp
     log.cpp
     entitybuffer.cpp
-    clientapi.cpp
     facadefactory.cpp
     commands.cpp
     facade.cpp
@@ -85,7 +89,7 @@ generate_flatbuffers(
     queuedcommand
 )
 
-generate_export_header(${PROJECT_NAME} BASE_NAME SinkCommon EXPORT_FILE_NAME sinkcommon_export.h)
+generate_export_header(${PROJECT_NAME} BASE_NAME Sink EXPORT_FILE_NAME sink_export.h)
 SET_TARGET_PROPERTIES(${PROJECT_NAME}
     PROPERTIES LINKER_LANGUAGE CXX
     VERSION "0.1"
@@ -95,15 +99,20 @@ SET_TARGET_PROPERTIES(${PROJECT_NAME}
 qt5_use_modules(${PROJECT_NAME} Network)
 target_link_libraries(${PROJECT_NAME} ${storage_LIBS} KF5::Async)
 install(TARGETS ${PROJECT_NAME}
-    EXPORT SinkCommonTargets ${KDE_INSTALL_TARGETS_DEFAULT_ARGS} ${LIBRARY_NAMELINK} )
+    EXPORT SinkTargets ${KDE_INSTALL_TARGETS_DEFAULT_ARGS} ${LIBRARY_NAMELINK} )
+
+add_clang_static_analysis(${PROJECT_NAME})
 
 install(FILES
-    clientapi.h
+    store.h
+    notifier.h
+    resourcecontrol.h
     domain/applicationdomaintype.h
     query.h
     inspection.h
     notification.h
     bufferadaptor.h
+    ${CMAKE_CURRENT_BINARY_DIR}/sink_export.h
     DESTINATION ${INCLUDE_INSTALL_DIR}/${PROJECT_NAME} COMPONENT Devel
 )