From e9b4b2d564c46e1b75c46376e7d4f7fdac757e5e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20Knau=C3=9F?= Date: Tue, 12 Jan 2016 16:54:19 +0100 Subject: Replace links to akonadi2common with propper cmake package --- framework/CMakeLists.txt | 3 +++ framework/mail/CMakeLists.txt | 5 +++-- framework/settings/CMakeLists.txt | 3 +-- 3 files changed, 7 insertions(+), 4 deletions(-) (limited to 'framework') diff --git a/framework/CMakeLists.txt b/framework/CMakeLists.txt index 3a441f99..c91ee0d1 100644 --- a/framework/CMakeLists.txt +++ b/framework/CMakeLists.txt @@ -16,6 +16,9 @@ include(KDEInstallDirs) find_package(Qt5 COMPONENTS REQUIRED Core Qml) +find_package(Akonadi2Common CONFIG REQUIRED) +find_package(KF5Async) + set(CMAKE_AUTOMOC ON) add_definitions("-Wall -std=c++0x -g") include_directories(SYSTEM ${CMAKE_SOURCE_DIR}/common) diff --git a/framework/mail/CMakeLists.txt b/framework/mail/CMakeLists.txt index 38ba3935..a8a4b3e8 100644 --- a/framework/mail/CMakeLists.txt +++ b/framework/mail/CMakeLists.txt @@ -5,14 +5,15 @@ set(mailplugin_SRCS singlemailcontroller.cpp folderlistmodel.cpp folderlistcontroller.cpp + filehtmlwriter.cpp + objecttreesource.cpp ) add_library(mailplugin SHARED ${mailplugin_SRCS}) qt5_use_modules(mailplugin Core Quick Qml) -target_link_libraries(mailplugin /work/install/lib64/libakonadi2common.so) -#target_link_libraries(mailplugin /home/mike/projects/_install/lib/x86_64-linux-gnu/libakonadi2common.so) +target_link_libraries(mailplugin KF5::akonadi2common) install(TARGETS mailplugin DESTINATION ${QML_INSTALL_DIR}/org/kde/kube/mail) install(FILES qmldir DESTINATION ${QML_INSTALL_DIR}/org/kde/kube/mail) diff --git a/framework/settings/CMakeLists.txt b/framework/settings/CMakeLists.txt index b0a8fe28..5d61851f 100644 --- a/framework/settings/CMakeLists.txt +++ b/framework/settings/CMakeLists.txt @@ -9,8 +9,7 @@ add_library(settingsplugin SHARED ${settingsplugin_SRCS}) qt5_use_modules(settingsplugin Core Quick Qml) -target_link_libraries(settingsplugin /work/install/lib64/libakonadi2common.so) -#target_link_libraries(settingsplugin /home/mike/projects/_install/lib/x86_64-linux-gnu/libakonadi2common.so) +target_link_libraries(settingsplugin KF5::akonadi2common) install(TARGETS settingsplugin DESTINATION ${QML_INSTALL_DIR}/org/kde/akonadi2/settings) install(FILES qmldir DESTINATION ${QML_INSTALL_DIR}/org/kde/akonadi2/settings) \ No newline at end of file -- cgit v1.2.3