summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMontel Laurent <[email protected]>2016-04-19 13:37:39 +0200
committerMontel Laurent <[email protected]>2016-04-19 13:37:39 +0200
commit6306303514c1801a979c936c2e099b3ac9bb1537 (patch)
tree01f496d8dc12999f5ea06d403454d581915d7212
parent93f5128862a79e39e43f3bbb73a828c23b38e5c1 (diff)
create own directory
-rw-r--r--kmail/src/kontactplugin/CMakeLists.txt43
-rw-r--r--kmail/src/kontactplugin/kmail/CMakeLists.txt42
-rw-r--r--kmail/src/kontactplugin/kmail/kcmkmailsummary.cpp (renamed from kmail/src/kontactplugin/kcmkmailsummary.cpp)0
-rw-r--r--kmail/src/kontactplugin/kmail/kcmkmailsummary.desktop (renamed from kmail/src/kontactplugin/kcmkmailsummary.desktop)0
-rw-r--r--kmail/src/kontactplugin/kmail/kcmkmailsummary.h (renamed from kmail/src/kontactplugin/kcmkmailsummary.h)0
-rw-r--r--kmail/src/kontactplugin/kmail/kmail.setdlg (renamed from kmail/src/kontactplugin/kmail.setdlg)0
-rw-r--r--kmail/src/kontactplugin/kmail/kmail_plugin.cpp (renamed from kmail/src/kontactplugin/kmail_plugin.cpp)2
-rw-r--r--kmail/src/kontactplugin/kmail/kmail_plugin.h (renamed from kmail/src/kontactplugin/kmail_plugin.h)0
-rw-r--r--kmail/src/kontactplugin/kmail/kmailplugin.desktop (renamed from kmail/src/kontactplugin/kmailplugin.desktop)0
-rw-r--r--kmail/src/kontactplugin/kmail/summarywidget.cpp (renamed from kmail/src/kontactplugin/summarywidget.cpp)0
-rw-r--r--kmail/src/kontactplugin/kmail/summarywidget.h (renamed from kmail/src/kontactplugin/summarywidget.h)0
11 files changed, 44 insertions, 43 deletions
diff --git a/kmail/src/kontactplugin/CMakeLists.txt b/kmail/src/kontactplugin/CMakeLists.txt
index 7c221a5..0f8f151 100644
--- a/kmail/src/kontactplugin/CMakeLists.txt
+++ b/kmail/src/kontactplugin/CMakeLists.txt
@@ -1,42 +1 @@
-include_directories(
- ${CMAKE_SOURCE_DIR}/kmail
- ${CMAKE_BINARY_DIR}/kmail
- ${Boost_INCLUDE_DIRS}
-)
-
-########### next target ###############
-set(interface_SRCS)
-
-set(kontact_kmail_plugins_interface_common_SRCS)
-ecm_qt_declare_logging_category(kontact_kmail_plugins_interface_common_SRCS HEADER kmailplugin_debug.h IDENTIFIER KMAILPLUGIN_LOG CATEGORY_NAME log_kmail_plugin)
-
-set(kontact_kmail_plugins_interface_SRCS ${interface_SRCS})
-qt5_add_dbus_interfaces(kontact_kmail_plugins_interface_SRCS ${kmail_BINARY_DIR}/src/org.kde.kmail.kmail.xml)
-
-set(kontact_kmailplugin_PART_SRCS kmail_plugin.cpp summarywidget.cpp ${kontact_kmail_plugins_interface_SRCS} ${kontact_kmail_plugins_interface_common_SRCS})
-
-add_library(kontact_kmailplugin MODULE ${kontact_kmailplugin_PART_SRCS})
-add_dependencies(kontact_kmailplugin kmail_xml)
-
-target_link_libraries(kontact_kmailplugin KF5::Mime KF5::KontactInterface KF5::CalendarCore KF5::CalendarUtils KF5::AkonadiCore KF5::Contacts KF5::AkonadiWidgets)
-
-########### next target ###############
-
-set(kcm_kmailsummary_PART_SRCS kcmkmailsummary.cpp ${kontact_kmail_plugins_interface_SRCS} ${kontact_kmail_plugins_interface_common_SRCS})
-
-add_library(kcm_kmailsummary MODULE ${kcm_kmailsummary_PART_SRCS})
-add_dependencies(kcm_kmailsummary kmail_xml)
-
-target_link_libraries(kcm_kmailsummary KF5::Mime KF5::PimCommon Qt5::DBus KF5::ConfigWidgets KF5::I18n)
-
-########### install files ###############
-
-install(TARGETS kontact_kmailplugin DESTINATION ${KDE_INSTALL_PLUGINDIR})
-
-install(TARGETS kcm_kmailsummary DESTINATION ${KDE_INSTALL_PLUGINDIR})
-
-install(FILES kmailplugin.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR}/kontact)
-
-install(FILES kcmkmailsummary.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR})
-
-install(FILES kmail.setdlg DESTINATION ${KDE_INSTALL_DATADIR}/kontact/ksettingsdialog)
+add_subdirectory(kmail)
diff --git a/kmail/src/kontactplugin/kmail/CMakeLists.txt b/kmail/src/kontactplugin/kmail/CMakeLists.txt
new file mode 100644
index 0000000..7c221a5
--- /dev/null
+++ b/kmail/src/kontactplugin/kmail/CMakeLists.txt
@@ -0,0 +1,42 @@
+include_directories(
+ ${CMAKE_SOURCE_DIR}/kmail
+ ${CMAKE_BINARY_DIR}/kmail
+ ${Boost_INCLUDE_DIRS}
+)
+
+########### next target ###############
+set(interface_SRCS)
+
+set(kontact_kmail_plugins_interface_common_SRCS)
+ecm_qt_declare_logging_category(kontact_kmail_plugins_interface_common_SRCS HEADER kmailplugin_debug.h IDENTIFIER KMAILPLUGIN_LOG CATEGORY_NAME log_kmail_plugin)
+
+set(kontact_kmail_plugins_interface_SRCS ${interface_SRCS})
+qt5_add_dbus_interfaces(kontact_kmail_plugins_interface_SRCS ${kmail_BINARY_DIR}/src/org.kde.kmail.kmail.xml)
+
+set(kontact_kmailplugin_PART_SRCS kmail_plugin.cpp summarywidget.cpp ${kontact_kmail_plugins_interface_SRCS} ${kontact_kmail_plugins_interface_common_SRCS})
+
+add_library(kontact_kmailplugin MODULE ${kontact_kmailplugin_PART_SRCS})
+add_dependencies(kontact_kmailplugin kmail_xml)
+
+target_link_libraries(kontact_kmailplugin KF5::Mime KF5::KontactInterface KF5::CalendarCore KF5::CalendarUtils KF5::AkonadiCore KF5::Contacts KF5::AkonadiWidgets)
+
+########### next target ###############
+
+set(kcm_kmailsummary_PART_SRCS kcmkmailsummary.cpp ${kontact_kmail_plugins_interface_SRCS} ${kontact_kmail_plugins_interface_common_SRCS})
+
+add_library(kcm_kmailsummary MODULE ${kcm_kmailsummary_PART_SRCS})
+add_dependencies(kcm_kmailsummary kmail_xml)
+
+target_link_libraries(kcm_kmailsummary KF5::Mime KF5::PimCommon Qt5::DBus KF5::ConfigWidgets KF5::I18n)
+
+########### install files ###############
+
+install(TARGETS kontact_kmailplugin DESTINATION ${KDE_INSTALL_PLUGINDIR})
+
+install(TARGETS kcm_kmailsummary DESTINATION ${KDE_INSTALL_PLUGINDIR})
+
+install(FILES kmailplugin.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR}/kontact)
+
+install(FILES kcmkmailsummary.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR})
+
+install(FILES kmail.setdlg DESTINATION ${KDE_INSTALL_DATADIR}/kontact/ksettingsdialog)
diff --git a/kmail/src/kontactplugin/kcmkmailsummary.cpp b/kmail/src/kontactplugin/kmail/kcmkmailsummary.cpp
index 48910df..48910df 100644
--- a/kmail/src/kontactplugin/kcmkmailsummary.cpp
+++ b/kmail/src/kontactplugin/kmail/kcmkmailsummary.cpp
diff --git a/kmail/src/kontactplugin/kcmkmailsummary.desktop b/kmail/src/kontactplugin/kmail/kcmkmailsummary.desktop
index 65104e1..65104e1 100644
--- a/kmail/src/kontactplugin/kcmkmailsummary.desktop
+++ b/kmail/src/kontactplugin/kmail/kcmkmailsummary.desktop
diff --git a/kmail/src/kontactplugin/kcmkmailsummary.h b/kmail/src/kontactplugin/kmail/kcmkmailsummary.h
index 7070670..7070670 100644
--- a/kmail/src/kontactplugin/kcmkmailsummary.h
+++ b/kmail/src/kontactplugin/kmail/kcmkmailsummary.h
diff --git a/kmail/src/kontactplugin/kmail.setdlg b/kmail/src/kontactplugin/kmail/kmail.setdlg
index 6222937..6222937 100644
--- a/kmail/src/kontactplugin/kmail.setdlg
+++ b/kmail/src/kontactplugin/kmail/kmail.setdlg
diff --git a/kmail/src/kontactplugin/kmail_plugin.cpp b/kmail/src/kontactplugin/kmail/kmail_plugin.cpp
index 668c04e..feb50d2 100644
--- a/kmail/src/kontactplugin/kmail_plugin.cpp
+++ b/kmail/src/kontactplugin/kmail/kmail_plugin.cpp
@@ -214,7 +214,7 @@ KontactInterface::Summary *KMailPlugin::createSummaryWidget(QWidget *parent)
////
-#include "../kmail_options.h"
+#include "../../kmail_options.h"
void KMailUniqueAppHandler::loadCommandLineOptions(QCommandLineParser *parser)
{
kmail_options(parser);
diff --git a/kmail/src/kontactplugin/kmail_plugin.h b/kmail/src/kontactplugin/kmail/kmail_plugin.h
index 9a7b20d..9a7b20d 100644
--- a/kmail/src/kontactplugin/kmail_plugin.h
+++ b/kmail/src/kontactplugin/kmail/kmail_plugin.h
diff --git a/kmail/src/kontactplugin/kmailplugin.desktop b/kmail/src/kontactplugin/kmail/kmailplugin.desktop
index ebb56c6..ebb56c6 100644
--- a/kmail/src/kontactplugin/kmailplugin.desktop
+++ b/kmail/src/kontactplugin/kmail/kmailplugin.desktop
diff --git a/kmail/src/kontactplugin/summarywidget.cpp b/kmail/src/kontactplugin/kmail/summarywidget.cpp
index 09d230e..09d230e 100644
--- a/kmail/src/kontactplugin/summarywidget.cpp
+++ b/kmail/src/kontactplugin/kmail/summarywidget.cpp
diff --git a/kmail/src/kontactplugin/summarywidget.h b/kmail/src/kontactplugin/kmail/summarywidget.h
index 2b939d6..2b939d6 100644
--- a/kmail/src/kontactplugin/summarywidget.h
+++ b/kmail/src/kontactplugin/kmail/summarywidget.h