summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSandro Knauß <sknauss@kde.org>2016-01-12 16:54:19 +0100
committerSandro Knauß <sknauss@kde.org>2016-01-12 16:54:19 +0100
commite9b4b2d564c46e1b75c46376e7d4f7fdac757e5e (patch)
treec034fb51443112c6324e60800f4c8718fb5e8002
parent021dde561b5ce86820013c681ff554b07590b052 (diff)
downloadkube-e9b4b2d564c46e1b75c46376e7d4f7fdac757e5e.tar.gz
kube-e9b4b2d564c46e1b75c46376e7d4f7fdac757e5e.zip
Replace links to akonadi2common with propper cmake package
-rw-r--r--framework/CMakeLists.txt3
-rw-r--r--framework/mail/CMakeLists.txt5
-rw-r--r--framework/settings/CMakeLists.txt3
3 files changed, 7 insertions, 4 deletions
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)
16 16
17find_package(Qt5 COMPONENTS REQUIRED Core Qml) 17find_package(Qt5 COMPONENTS REQUIRED Core Qml)
18 18
19find_package(Akonadi2Common CONFIG REQUIRED)
20find_package(KF5Async)
21
19set(CMAKE_AUTOMOC ON) 22set(CMAKE_AUTOMOC ON)
20add_definitions("-Wall -std=c++0x -g") 23add_definitions("-Wall -std=c++0x -g")
21include_directories(SYSTEM ${CMAKE_SOURCE_DIR}/common) 24include_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
5 singlemailcontroller.cpp 5 singlemailcontroller.cpp
6 folderlistmodel.cpp 6 folderlistmodel.cpp
7 folderlistcontroller.cpp 7 folderlistcontroller.cpp
8 filehtmlwriter.cpp
9 objecttreesource.cpp
8) 10)
9 11
10add_library(mailplugin SHARED ${mailplugin_SRCS}) 12add_library(mailplugin SHARED ${mailplugin_SRCS})
11 13
12qt5_use_modules(mailplugin Core Quick Qml) 14qt5_use_modules(mailplugin Core Quick Qml)
13 15
14target_link_libraries(mailplugin /work/install/lib64/libakonadi2common.so) 16target_link_libraries(mailplugin KF5::akonadi2common)
15#target_link_libraries(mailplugin /home/mike/projects/_install/lib/x86_64-linux-gnu/libakonadi2common.so)
16 17
17install(TARGETS mailplugin DESTINATION ${QML_INSTALL_DIR}/org/kde/kube/mail) 18install(TARGETS mailplugin DESTINATION ${QML_INSTALL_DIR}/org/kde/kube/mail)
18install(FILES qmldir DESTINATION ${QML_INSTALL_DIR}/org/kde/kube/mail) 19install(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})
9 9
10qt5_use_modules(settingsplugin Core Quick Qml) 10qt5_use_modules(settingsplugin Core Quick Qml)
11 11
12target_link_libraries(settingsplugin /work/install/lib64/libakonadi2common.so) 12target_link_libraries(settingsplugin KF5::akonadi2common)
13#target_link_libraries(settingsplugin /home/mike/projects/_install/lib/x86_64-linux-gnu/libakonadi2common.so)
14 13
15install(TARGETS settingsplugin DESTINATION ${QML_INSTALL_DIR}/org/kde/akonadi2/settings) 14install(TARGETS settingsplugin DESTINATION ${QML_INSTALL_DIR}/org/kde/akonadi2/settings)
16install(FILES qmldir DESTINATION ${QML_INSTALL_DIR}/org/kde/akonadi2/settings) \ No newline at end of file 15install(FILES qmldir DESTINATION ${QML_INSTALL_DIR}/org/kde/akonadi2/settings) \ No newline at end of file