summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--framework/CMakeLists.txt5
-rw-r--r--framework/accounts/CMakeLists.txt3
-rw-r--r--framework/actions/CMakeLists.txt3
-rw-r--r--framework/domain/CMakeLists.txt3
-rw-r--r--framework/notifications/CMakeLists.txt3
-rw-r--r--framework/settings/CMakeLists.txt3
6 files changed, 8 insertions, 12 deletions
diff --git a/framework/CMakeLists.txt b/framework/CMakeLists.txt
index f097f658..ebe308c6 100644
--- a/framework/CMakeLists.txt
+++ b/framework/CMakeLists.txt
@@ -32,9 +32,10 @@ include_directories(SYSTEM ${KDE_INSTALL_FULL_INCLUDEDIR}/KF5/KMime)
32enable_testing() 32enable_testing()
33 33
34set(SINK_RESOURCE_PLUGINS_PATH ${QT_PLUGIN_INSTALL_DIR}/sink/resources) 34set(SINK_RESOURCE_PLUGINS_PATH ${QT_PLUGIN_INSTALL_DIR}/sink/resources)
35set(FRAMEWORK_INSTALL_DIR ${QML_INSTALL_DIR}/org/kube/framework)
35 36
36install(FILES qmldir DESTINATION ${QML_INSTALL_DIR}/org/kube/framework) 37install(DIRECTORY qml DESTINATION ${FRAMEWORK_INSTALL_DIR})
37install(DIRECTORY qml DESTINATION ${QML_INSTALL_DIR}/org/kube/framework) 38install(FILES qmldir DESTINATION ${FRAMEWORK_INSTALL_DIR})
38 39
39# The actions framework 40# The actions framework
40add_subdirectory(actions) 41add_subdirectory(actions)
diff --git a/framework/accounts/CMakeLists.txt b/framework/accounts/CMakeLists.txt
index bccafd77..d0e5001c 100644
--- a/framework/accounts/CMakeLists.txt
+++ b/framework/accounts/CMakeLists.txt
@@ -9,5 +9,4 @@ add_library(accountsplugin SHARED ${accountsplugin_SRCS})
9qt5_use_modules(accountsplugin Core Quick Qml) 9qt5_use_modules(accountsplugin Core Quick Qml)
10target_link_libraries(accountsplugin sink mailplugin) 10target_link_libraries(accountsplugin sink mailplugin)
11 11
12install(TARGETS accountsplugin DESTINATION ${QML_INSTALL_DIR}/org/kube/framework/accounts) 12install(TARGETS accountsplugin DESTINATION ${FRAMEWORK_INSTALL_DIR})
13install(FILES qmldir DESTINATION ${QML_INSTALL_DIR}/org/kube/framework/accounts)
diff --git a/framework/actions/CMakeLists.txt b/framework/actions/CMakeLists.txt
index 2b1bb230..72dd9fcd 100644
--- a/framework/actions/CMakeLists.txt
+++ b/framework/actions/CMakeLists.txt
@@ -12,7 +12,6 @@ add_library(actionplugin SHARED ${SRCS})
12target_link_libraries(actionplugin KAsync sink) 12target_link_libraries(actionplugin KAsync sink)
13qt5_use_modules(actionplugin Core Quick Qml) 13qt5_use_modules(actionplugin Core Quick Qml)
14 14
15install(TARGETS actionplugin DESTINATION ${QML_INSTALL_DIR}/org/kube/framework/actions) 15install(TARGETS actionplugin DESTINATION ${FRAMEWORK_INSTALL_DIR})
16install(FILES qmldir DESTINATION ${QML_INSTALL_DIR}/org/kube/framework/actions)
17 16
18add_subdirectory(tests) 17add_subdirectory(tests)
diff --git a/framework/domain/CMakeLists.txt b/framework/domain/CMakeLists.txt
index b3f7acc5..38e0eb12 100644
--- a/framework/domain/CMakeLists.txt
+++ b/framework/domain/CMakeLists.txt
@@ -36,7 +36,6 @@ target_link_libraries(mailplugin actionplugin settingsplugin sink mimetreeparser
36 36
37add_subdirectory(actions/tests) 37add_subdirectory(actions/tests)
38 38
39install(TARGETS mailplugin DESTINATION ${QML_INSTALL_DIR}/org/kube/framework/domain) 39install(TARGETS mailplugin DESTINATION ${FRAMEWORK_INSTALL_DIR})
40install(FILES qmldir DESTINATION ${QML_INSTALL_DIR}/org/kube/framework/domain)
41 40
42add_subdirectory(mimetreeparser) 41add_subdirectory(mimetreeparser)
diff --git a/framework/notifications/CMakeLists.txt b/framework/notifications/CMakeLists.txt
index ec2f52c2..3d3f3c66 100644
--- a/framework/notifications/CMakeLists.txt
+++ b/framework/notifications/CMakeLists.txt
@@ -8,5 +8,4 @@ add_library(notificationplugin SHARED ${SRCS})
8target_link_libraries(notificationplugin sink) 8target_link_libraries(notificationplugin sink)
9qt5_use_modules(notificationplugin Core Quick Qml) 9qt5_use_modules(notificationplugin Core Quick Qml)
10 10
11install(TARGETS notificationplugin DESTINATION ${QML_INSTALL_DIR}/org/kube/framework/notifications) 11install(TARGETS notificationplugin DESTINATION ${FRAMEWORK_INSTALL_DIR})
12install(FILES qmldir DESTINATION ${QML_INSTALL_DIR}/org/kube/framework/notifications)
diff --git a/framework/settings/CMakeLists.txt b/framework/settings/CMakeLists.txt
index bf456138..d5f54a04 100644
--- a/framework/settings/CMakeLists.txt
+++ b/framework/settings/CMakeLists.txt
@@ -9,5 +9,4 @@ qt5_use_modules(settingsplugin Core Quick Qml)
9 9
10target_link_libraries(settingsplugin) 10target_link_libraries(settingsplugin)
11 11
12install(TARGETS settingsplugin DESTINATION ${QML_INSTALL_DIR}/org/kube/framework/settings) 12install(TARGETS settingsplugin DESTINATION ${FRAMEWORK_INSTALL_DIR})
13install(FILES qmldir DESTINATION ${QML_INSTALL_DIR}/org/kube/framework/settings)