diff options
| author | Christian Mollekopf <chrigi_1@fastmail.fm> | 2016-01-21 11:36:43 +0100 |
|---|---|---|
| committer | Christian Mollekopf <chrigi_1@fastmail.fm> | 2016-01-21 11:36:43 +0100 |
| commit | bf96cfa0d75d256e036c76ec64f0f456014f2739 (patch) | |
| tree | 3ab0ff603dfccb9f28040af3a1559b01af09aa3f /framework/settings | |
| parent | e4e11ba46f4ccce5f9ca63ab758a132d945061e8 (diff) | |
| parent | 9a3059769a0bf9dbf81e523c9245d2aa98420bb5 (diff) | |
| download | kube-bf96cfa0d75d256e036c76ec64f0f456014f2739.tar.gz kube-bf96cfa0d75d256e036c76ec64f0f456014f2739.zip | |
Merge remote-tracking branch 'origin/dev/libotp' into develop
Conflicts:
framework/mail/CMakeLists.txt
Diffstat (limited to 'framework/settings')
| -rw-r--r-- | framework/settings/CMakeLists.txt | 3 |
1 files changed, 1 insertions, 2 deletions
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 |