4 files changed, 12 insertions, 9 deletions

diff --git a/client/CMakeLists.txt b/client/CMakeLists.txt
index 1ebf5fd..f85839d 100644
--- a/client/CMakeLists.txt
+++ b/client/CMakeLists.txt
@@ -7,13 +7,15 @@ set(akonadi2client_SRCS
     threadboundary.cpp
 )
 
-add_library(${PROJECT_NAME}_lib SHARED ${akonadi2client_SRCS})
-target_link_libraries(${PROJECT_NAME}_lib akonadi2common)
-qt5_use_modules(${PROJECT_NAME}_lib Widgets Network)
-
-add_executable(${PROJECT_NAME} main.cpp)
-target_link_libraries(${PROJECT_NAME} akonadi2_client_lib akonadi2common)
+add_library(${PROJECT_NAME} SHARED ${akonadi2client_SRCS})
+target_link_libraries(${PROJECT_NAME} akonadi2common)
 qt5_use_modules(${PROJECT_NAME} Widgets Network)
-install(TARGETS ${PROJECT_NAME} DESTINATION bin)
+install(TARGETS ${PROJECT_NAME} DESTINATION lib)
+
+add_executable(${PROJECT_NAME}_bin main.cpp)
+set_target_properties(${PROJECT_NAME}_bin PROPERTIES OUTPUT_NAME ${PROJECT_NAME})
+target_link_libraries(${PROJECT_NAME}_bin ${PROJECT_NAME} akonadi2common)
+qt5_use_modules(${PROJECT_NAME}_bin Widgets Network)
+install(TARGETS ${PROJECT_NAME}_bin DESTINATION bin)
 
 add_subdirectory(test)
diff --git a/client/test/CMakeLists.txt b/client/test/CMakeLists.txt
index 0d5da1b..601899a 100644
--- a/client/test/CMakeLists.txt
+++ b/client/test/CMakeLists.txt
@@ -5,7 +5,7 @@ macro(auto_tests)
     foreach(_testname ${ARGN})
         add_executable(${_testname} ${_testname}.cpp ${store_SRCS})
         qt5_use_modules(${_testname} Core Test)
-        target_link_libraries(${_testname} lmdb akonadi2_client_lib)
+        target_link_libraries(${_testname} lmdb akonadi2_client)
         add_test(NAME ${_testname} COMMAND ${_testname})
     endforeach(_testname)
 endmacro(auto_tests)
diff --git a/common/CMakeLists.txt b/common/CMakeLists.txt
index c0cc7d9..d200635 100644
--- a/common/CMakeLists.txt
+++ b/common/CMakeLists.txt
@@ -21,3 +21,4 @@ generate_export_header(${PROJECT_NAME} BASE_NAME Akonadi2Common EXPORT_FILE_NAME
 SET_TARGET_PROPERTIES(${PROJECT_NAME} PROPERTIES LINKER_LANGUAGE CXX)
 qt5_use_modules(${PROJECT_NAME} Widgets)
 target_link_libraries(${PROJECT_NAME} ${storage_LIBS})
+install(TARGETS ${PROJECT_NAME} DESTINATION lib)
diff --git a/dummyresource/CMakeLists.txt b/dummyresource/CMakeLists.txt
index 8fa2eee..57b916a 100644
--- a/dummyresource/CMakeLists.txt
+++ b/dummyresource/CMakeLists.txt
@@ -6,7 +6,7 @@ generate_flatbuffers(dummycalendar)
 
 #Client plugin
 add_library(${PROJECT_NAME}_facade SHARED facade.cpp)
-target_link_libraries(${PROJECT_NAME}_facade akonadi2common akonadi2_client_lib)
+target_link_libraries(${PROJECT_NAME}_facade akonadi2common akonadi2_client)
 qt5_use_modules(${PROJECT_NAME}_facade Widgets Network)
 #install(TARGETS ${PROJECT_NAME}_facade DESTINATION bin)