summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMontel Laurent <montel@kde.org>2016-09-14 05:35:01 (GMT)
committerMontel Laurent <montel@kde.org>2016-09-14 05:35:01 (GMT)
commit9bcce7d5831e6931321cdac36a3340c3e0eb14fb (patch)
treece6cbe78a04e062cf194b19ef7bca86ddf4222af
parent8a5e3cae89e905bb7373709d17f1f64f2060055d (diff)
continue to migrate to kcoreaddons macros
-rw-r--r--plugins/messageviewerheaderplugins/defaultgrantleeheaderstyleplugin/CMakeLists.txt5
-rw-r--r--plugins/messageviewerheaderplugins/enterpriseheaderstyleplugin/CMakeLists.txt5
-rw-r--r--plugins/messageviewerheaderplugins/fancyheaderstyleplugin/CMakeLists.txt5
-rw-r--r--plugins/messageviewerheaderplugins/grantleeheaderstyleplugin/CMakeLists.txt6
-rw-r--r--plugins/messageviewerheaderplugins/longheaderstyleplugin/CMakeLists.txt5
5 files changed, 10 insertions, 16 deletions
diff --git a/plugins/messageviewerheaderplugins/defaultgrantleeheaderstyleplugin/CMakeLists.txt b/plugins/messageviewerheaderplugins/defaultgrantleeheaderstyleplugin/CMakeLists.txt
index 8934bed..6edcbab 100644
--- a/plugins/messageviewerheaderplugins/defaultgrantleeheaderstyleplugin/CMakeLists.txt
+++ b/plugins/messageviewerheaderplugins/defaultgrantleeheaderstyleplugin/CMakeLists.txt
@@ -8,8 +8,8 @@ kconfig_add_kcfg_files(messageviewer_defaultgrantleeheaderstyleplugin_SRCS
settings/globalsettings_base.kcfgc
)
-
-add_library(messageviewer_defaultgrantleeheaderstyleplugin MODULE ${messageviewer_defaultgrantleeheaderstyleplugin_SRCS})
+kcoreaddons_add_plugin(messageviewer_defaultgrantleeheaderstyleplugin JSON messageviewer_defaultgrantleeheaderstyleplugin.json SOURCES
+ ${messageviewer_defaultgrantleeheaderstyleplugin_SRCS} INSTALL_NAMESPACE messageviewer)
target_link_libraries(messageviewer_defaultgrantleeheaderstyleplugin
KF5::MessageViewer
@@ -17,5 +17,4 @@ target_link_libraries(messageviewer_defaultgrantleeheaderstyleplugin
KF5::XmlGui
)
-install(TARGETS messageviewer_defaultgrantleeheaderstyleplugin DESTINATION ${PLUGIN_INSTALL_DIR}/messageviewer)
install(DIRECTORY theme/5.2 DESTINATION ${KDE_INSTALL_DATADIR}/messageviewer/defaultthemes/ )
diff --git a/plugins/messageviewerheaderplugins/enterpriseheaderstyleplugin/CMakeLists.txt b/plugins/messageviewerheaderplugins/enterpriseheaderstyleplugin/CMakeLists.txt
index d08214b..74459ca 100644
--- a/plugins/messageviewerheaderplugins/enterpriseheaderstyleplugin/CMakeLists.txt
+++ b/plugins/messageviewerheaderplugins/enterpriseheaderstyleplugin/CMakeLists.txt
@@ -4,12 +4,11 @@ set(messageviewer_enterpriseheaderstyleplugin_SRCS
enterpriseheaderstyle.cpp
)
-add_library(messageviewer_enterpriseheaderstyleplugin MODULE ${messageviewer_enterpriseheaderstyleplugin_SRCS})
+kcoreaddons_add_plugin(messageviewer_enterpriseheaderstyleplugin JSON messageviewer_enterpriseheaderstyleplugin.json SOURCES
+ ${messageviewer_enterpriseheaderstyleplugin_SRCS} INSTALL_NAMESPACE messageviewer)
target_link_libraries(messageviewer_enterpriseheaderstyleplugin
KF5::MessageViewer
KF5::XmlGui
KF5::I18n
)
-
-install(TARGETS messageviewer_enterpriseheaderstyleplugin DESTINATION ${PLUGIN_INSTALL_DIR}/messageviewer)
diff --git a/plugins/messageviewerheaderplugins/fancyheaderstyleplugin/CMakeLists.txt b/plugins/messageviewerheaderplugins/fancyheaderstyleplugin/CMakeLists.txt
index e97d62e..e17b289 100644
--- a/plugins/messageviewerheaderplugins/fancyheaderstyleplugin/CMakeLists.txt
+++ b/plugins/messageviewerheaderplugins/fancyheaderstyleplugin/CMakeLists.txt
@@ -4,7 +4,8 @@ set(messageviewer_fancyheaderstyleplugin_SRCS
fancyheaderstyle.cpp
)
-add_library(messageviewer_fancyheaderstyleplugin MODULE ${messageviewer_fancyheaderstyleplugin_SRCS})
+kcoreaddons_add_plugin(messageviewer_fancyheaderstyleplugin JSON messageviewer_fancyheaderstyleplugin.json SOURCES
+ ${messageviewer_fancyheaderstyleplugin_SRCS} INSTALL_NAMESPACE messageviewer)
target_link_libraries(messageviewer_fancyheaderstyleplugin
KF5::MessageViewer
@@ -12,5 +13,3 @@ target_link_libraries(messageviewer_fancyheaderstyleplugin
KF5::IconThemes
KF5::I18n
)
-
-install(TARGETS messageviewer_fancyheaderstyleplugin DESTINATION ${PLUGIN_INSTALL_DIR}/messageviewer)
diff --git a/plugins/messageviewerheaderplugins/grantleeheaderstyleplugin/CMakeLists.txt b/plugins/messageviewerheaderplugins/grantleeheaderstyleplugin/CMakeLists.txt
index a1152d1..7906a6d 100644
--- a/plugins/messageviewerheaderplugins/grantleeheaderstyleplugin/CMakeLists.txt
+++ b/plugins/messageviewerheaderplugins/grantleeheaderstyleplugin/CMakeLists.txt
@@ -3,13 +3,11 @@ set(messageviewer_grantleeheaderstyleplugin_SRCS
grantleeheaderstyleinterface.cpp
grantleeheaderstrategy.cpp
)
-
-add_library(messageviewer_grantleeheaderstyleplugin MODULE ${messageviewer_grantleeheaderstyleplugin_SRCS})
+kcoreaddons_add_plugin(messageviewer_grantleeheaderstyleplugin JSON messageviewer_grantleeheaderstyleplugin.json SOURCES
+ ${messageviewer_grantleeheaderstyleplugin_SRCS} INSTALL_NAMESPACE messageviewer)
target_link_libraries(messageviewer_grantleeheaderstyleplugin
KF5::MessageViewer
KF5::GrantleeTheme
KF5::XmlGui
)
-
-install(TARGETS messageviewer_grantleeheaderstyleplugin DESTINATION ${PLUGIN_INSTALL_DIR}/messageviewer)
diff --git a/plugins/messageviewerheaderplugins/longheaderstyleplugin/CMakeLists.txt b/plugins/messageviewerheaderplugins/longheaderstyleplugin/CMakeLists.txt
index 2b4d9ba..ac49558 100644
--- a/plugins/messageviewerheaderplugins/longheaderstyleplugin/CMakeLists.txt
+++ b/plugins/messageviewerheaderplugins/longheaderstyleplugin/CMakeLists.txt
@@ -3,12 +3,11 @@ set(messageviewer_longheaderstyleplugin_SRCS
longheaderstyleinterface.cpp
)
-add_library(messageviewer_longheaderstyleplugin MODULE ${messageviewer_longheaderstyleplugin_SRCS})
+kcoreaddons_add_plugin(messageviewer_longheaderstyleplugin JSON messageviewer_longheaderstyleplugin.json SOURCES
+ ${messageviewer_longheaderstyleplugin_SRCS} INSTALL_NAMESPACE messageviewer)
target_link_libraries(messageviewer_longheaderstyleplugin
KF5::MessageViewer
KF5::XmlGui
KF5::I18n
)
-
-install(TARGETS messageviewer_longheaderstyleplugin DESTINATION ${PLUGIN_INSTALL_DIR}/messageviewer)