diff options
author | Sandro Knauß <sknauss@kde.org> | 2016-01-12 16:54:19 +0100 |
---|---|---|
committer | Sandro Knauß <sknauss@kde.org> | 2016-01-12 16:54:19 +0100 |
commit | e9b4b2d564c46e1b75c46376e7d4f7fdac757e5e (patch) | |
tree | c034fb51443112c6324e60800f4c8718fb5e8002 | |
parent | 021dde561b5ce86820013c681ff554b07590b052 (diff) | |
download | kube-e9b4b2d564c46e1b75c46376e7d4f7fdac757e5e.tar.gz kube-e9b4b2d564c46e1b75c46376e7d4f7fdac757e5e.zip |
Replace links to akonadi2common with propper cmake package
-rw-r--r-- | framework/CMakeLists.txt | 3 | ||||
-rw-r--r-- | framework/mail/CMakeLists.txt | 5 | ||||
-rw-r--r-- | framework/settings/CMakeLists.txt | 3 |
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 | ||
17 | find_package(Qt5 COMPONENTS REQUIRED Core Qml) | 17 | find_package(Qt5 COMPONENTS REQUIRED Core Qml) |
18 | 18 | ||
19 | find_package(Akonadi2Common CONFIG REQUIRED) | ||
20 | find_package(KF5Async) | ||
21 | |||
19 | set(CMAKE_AUTOMOC ON) | 22 | set(CMAKE_AUTOMOC ON) |
20 | add_definitions("-Wall -std=c++0x -g") | 23 | add_definitions("-Wall -std=c++0x -g") |
21 | include_directories(SYSTEM ${CMAKE_SOURCE_DIR}/common) | 24 | 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 | |||
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 | ||
10 | add_library(mailplugin SHARED ${mailplugin_SRCS}) | 12 | add_library(mailplugin SHARED ${mailplugin_SRCS}) |
11 | 13 | ||
12 | qt5_use_modules(mailplugin Core Quick Qml) | 14 | qt5_use_modules(mailplugin Core Quick Qml) |
13 | 15 | ||
14 | target_link_libraries(mailplugin /work/install/lib64/libakonadi2common.so) | 16 | target_link_libraries(mailplugin KF5::akonadi2common) |
15 | #target_link_libraries(mailplugin /home/mike/projects/_install/lib/x86_64-linux-gnu/libakonadi2common.so) | ||
16 | 17 | ||
17 | install(TARGETS mailplugin DESTINATION ${QML_INSTALL_DIR}/org/kde/kube/mail) | 18 | install(TARGETS mailplugin DESTINATION ${QML_INSTALL_DIR}/org/kde/kube/mail) |
18 | install(FILES qmldir DESTINATION ${QML_INSTALL_DIR}/org/kde/kube/mail) | 19 | 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}) | |||
9 | 9 | ||
10 | qt5_use_modules(settingsplugin Core Quick Qml) | 10 | qt5_use_modules(settingsplugin Core Quick Qml) |
11 | 11 | ||
12 | target_link_libraries(settingsplugin /work/install/lib64/libakonadi2common.so) | 12 | target_link_libraries(settingsplugin KF5::akonadi2common) |
13 | #target_link_libraries(settingsplugin /home/mike/projects/_install/lib/x86_64-linux-gnu/libakonadi2common.so) | ||
14 | 13 | ||
15 | install(TARGETS settingsplugin DESTINATION ${QML_INSTALL_DIR}/org/kde/akonadi2/settings) | 14 | install(TARGETS settingsplugin DESTINATION ${QML_INSTALL_DIR}/org/kde/akonadi2/settings) |
16 | install(FILES qmldir DESTINATION ${QML_INSTALL_DIR}/org/kde/akonadi2/settings) \ No newline at end of file | 15 | install(FILES qmldir DESTINATION ${QML_INSTALL_DIR}/org/kde/akonadi2/settings) \ No newline at end of file |