From 3bea7e1ae1e102b0f06231626fd768f795d46db8 Mon Sep 17 00:00:00 2001 From: Aaron Seigo Date: Mon, 15 Dec 2014 07:43:20 +0100 Subject: shared libraries, install targets --- client/CMakeLists.txt | 16 +++++++++------- client/test/CMakeLists.txt | 2 +- 2 files changed, 10 insertions(+), 8 deletions(-) (limited to 'client') 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) -- cgit v1.2.3