From bfba957a7ebc64925bc553200616724cba9b1e37 Mon Sep 17 00:00:00 2001
From: Christian Mollekopf <chrigi_1@fastmail.fm>
Date: Wed, 5 Apr 2017 09:36:22 +0200
Subject: Install all plugins into the same folder

---
 framework/CMakeLists.txt               | 5 +++--
 framework/accounts/CMakeLists.txt      | 3 +--
 framework/actions/CMakeLists.txt       | 3 +--
 framework/domain/CMakeLists.txt        | 3 +--
 framework/notifications/CMakeLists.txt | 3 +--
 framework/settings/CMakeLists.txt      | 3 +--
 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)
 enable_testing()
 
 set(SINK_RESOURCE_PLUGINS_PATH ${QT_PLUGIN_INSTALL_DIR}/sink/resources)
+set(FRAMEWORK_INSTALL_DIR ${QML_INSTALL_DIR}/org/kube/framework)
 
-install(FILES qmldir DESTINATION ${QML_INSTALL_DIR}/org/kube/framework)
-install(DIRECTORY qml DESTINATION ${QML_INSTALL_DIR}/org/kube/framework)
+install(DIRECTORY qml DESTINATION ${FRAMEWORK_INSTALL_DIR})
+install(FILES qmldir DESTINATION ${FRAMEWORK_INSTALL_DIR})
 
 # The actions framework
 add_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})
 qt5_use_modules(accountsplugin Core Quick Qml)
 target_link_libraries(accountsplugin sink mailplugin)
 
-install(TARGETS accountsplugin DESTINATION ${QML_INSTALL_DIR}/org/kube/framework/accounts)
-install(FILES qmldir DESTINATION ${QML_INSTALL_DIR}/org/kube/framework/accounts)
+install(TARGETS accountsplugin DESTINATION ${FRAMEWORK_INSTALL_DIR})
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})
 target_link_libraries(actionplugin KAsync sink)
 qt5_use_modules(actionplugin Core Quick Qml)
 
-install(TARGETS actionplugin DESTINATION ${QML_INSTALL_DIR}/org/kube/framework/actions)
-install(FILES qmldir DESTINATION ${QML_INSTALL_DIR}/org/kube/framework/actions)
+install(TARGETS actionplugin DESTINATION ${FRAMEWORK_INSTALL_DIR})
 
 add_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
 
 add_subdirectory(actions/tests)
 
-install(TARGETS mailplugin DESTINATION ${QML_INSTALL_DIR}/org/kube/framework/domain)
-install(FILES qmldir DESTINATION ${QML_INSTALL_DIR}/org/kube/framework/domain)
+install(TARGETS mailplugin DESTINATION ${FRAMEWORK_INSTALL_DIR})
 
 add_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})
 target_link_libraries(notificationplugin sink)
 qt5_use_modules(notificationplugin Core Quick Qml)
 
-install(TARGETS notificationplugin DESTINATION ${QML_INSTALL_DIR}/org/kube/framework/notifications)
-install(FILES qmldir DESTINATION ${QML_INSTALL_DIR}/org/kube/framework/notifications)
+install(TARGETS notificationplugin DESTINATION ${FRAMEWORK_INSTALL_DIR})
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)
 
 target_link_libraries(settingsplugin)
 
-install(TARGETS settingsplugin DESTINATION ${QML_INSTALL_DIR}/org/kube/framework/settings)
-install(FILES qmldir DESTINATION ${QML_INSTALL_DIR}/org/kube/framework/settings)
+install(TARGETS settingsplugin DESTINATION ${FRAMEWORK_INSTALL_DIR})
-- 
cgit v1.2.3