From 513ebb12e59a9524ec8cb02e828dcab144baae87 Mon Sep 17 00:00:00 2001 From: Laurent Montel Date: Mon, 14 Dec 2020 21:49:45 +0100 Subject: [PATCH] Allow to use UNITY build see https://cmake.org/cmake/help/latest/prop_tgt/UNITY_BUILD.html (Reduce compile time. Need cmake 3.16.0) --- CMakeLists.txt | 12 ++++++++++++ src/CMakeLists.txt | 3 +++ .../widgethandler/numericdoublerulewidgethandler.cpp | 12 ++++++------ .../snippetcustomfileattachmentnamedialog.cpp | 6 +++--- src/snippets/snippetselectattachmentdialog.cpp | 6 +++--- 5 files changed, 27 insertions(+), 12 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 2b4e5c7..5d5ecd2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -93,6 +93,18 @@ add_definitions(-DQT_NO_FOREACH) add_definitions(-DQT_NO_KEYWORDS) option(KDEPIM_RUN_AKONADI_TEST "Enable autotest based on Akonadi." TRUE) +# Not supported yet +#option(USE_UNIFY_CMAKE_SUPPORT "Use UNIFY cmake support (speedup compile time)" FALSE) + +#set(COMPILE_WITH_CMAKE_SUPPORT false) +#if (USE_UNIFY_CMAKE_SUPPORT) +# if(${CMAKE_VERSION} VERSION_LESS "3.16.0") +# message(STATUS "CMAKE version is less than 3.16.0 . We can't use cmake unify build support") +# else() +# set(COMPILE_WITH_CMAKE_SUPPORT true) +# endif() +#endif() + add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x050f00) add_definitions(-DKF_DISABLE_DEPRECATED_BEFORE_AND_AT=0x054E00) set(CMAKE_CXX_STANDARD 14) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index cd02ae9..0a2fab5 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -232,6 +232,9 @@ qt5_add_dbus_interfaces(libmailcommon_SRCS ${CMAKE_CURRENT_SOURCE_DIR}/dbusinter ) add_library(KF5MailCommon ${libmailcommon_SRCS}) +if (COMPILE_WITH_CMAKE_SUPPORT) + set_target_properties(KF5MailCommon PROPERTIES UNITY_BUILD ON) +endif() generate_export_header(KF5MailCommon BASE_NAME mailcommon) diff --git a/src/search/widgethandler/numericdoublerulewidgethandler.cpp b/src/search/widgethandler/numericdoublerulewidgethandler.cpp index cf03fac..60d16ff 100644 --- a/src/search/widgethandler/numericdoublerulewidgethandler.cpp +++ b/src/search/widgethandler/numericdoublerulewidgethandler.cpp @@ -18,7 +18,7 @@ using namespace MailCommon; static const struct { SearchRule::Function id; const char *displayName; -} NumericFunctions[] = { +} NumericDoubleFunctions[] = { { SearchRule::FuncEquals, I18N_NOOP("is equal to") }, { SearchRule::FuncNotEqual, I18N_NOOP("is not equal to") }, { SearchRule::FuncIsGreater, I18N_NOOP("is greater than") }, @@ -26,8 +26,8 @@ static const struct { { SearchRule::FuncIsLess, I18N_NOOP("is less than") }, { SearchRule::FuncIsGreaterOrEqual, I18N_NOOP("is greater than or equal to") } }; -static const int NumericFunctionCount - = sizeof(NumericFunctions) / sizeof(*NumericFunctions); +static const int NumericDoubleFunctionCount + = sizeof(NumericDoubleFunctions) / sizeof(*NumericDoubleFunctions); QWidget *NumericDoubleRuleWidgetHandler::createFunctionWidget( int number, QStackedWidget *functionStack, const QObject *receiver, bool /*isBalooSearch*/) const @@ -39,7 +39,7 @@ QWidget *NumericDoubleRuleWidgetHandler::createFunctionWidget( auto funcCombo = new QComboBox(functionStack); funcCombo->setMinimumWidth(50); funcCombo->setObjectName(QStringLiteral("numericDoubleRuleFuncCombo")); - for (int i = 0; i < NumericFunctionCount; ++i) { + for (int i = 0; i < NumericDoubleFunctionCount; ++i) { funcCombo->addItem(i18n(NumericFunctions[i].displayName)); } funcCombo->adjustSize(); @@ -177,7 +177,7 @@ bool NumericDoubleRuleWidgetHandler::setRule(QStackedWidget *functionStack, QSta // set the function const SearchRule::Function func = rule->function(); int funcIndex = 0; - for (; funcIndex < NumericFunctionCount; ++funcIndex) { + for (; funcIndex < NumericDoubleFunctionCount; ++funcIndex) { if (func == NumericFunctions[funcIndex].id) { break; } @@ -187,7 +187,7 @@ bool NumericDoubleRuleWidgetHandler::setRule(QStackedWidget *functionStack, QSta if (funcCombo) { funcCombo->blockSignals(true); - if (funcIndex < NumericFunctionCount) { + if (funcIndex < NumericDoubleFunctionCount) { funcCombo->setCurrentIndex(funcIndex); } else { funcCombo->setCurrentIndex(0); diff --git a/src/snippets/snippetcustomfileattachmentnamedialog.cpp b/src/snippets/snippetcustomfileattachmentnamedialog.cpp index 9c68a6c..b333876 100644 --- a/src/snippets/snippetcustomfileattachmentnamedialog.cpp +++ b/src/snippets/snippetcustomfileattachmentnamedialog.cpp @@ -15,7 +15,7 @@ #include #include namespace { -static const char myConfigGroupName[] = "SnippetCustomFileAttachmentNameDialog"; +static const char mySnippetCustomFileAttachmentNameDialogGroupName[] = "SnippetCustomFileAttachmentNameDialog"; } using namespace MailCommon; SnippetCustomFileAttachmentNameDialog::SnippetCustomFileAttachmentNameDialog(QWidget *parent) @@ -49,7 +49,7 @@ SnippetCustomFileAttachmentNameDialog::~SnippetCustomFileAttachmentNameDialog() void SnippetCustomFileAttachmentNameDialog::readConfig() { - KConfigGroup group(KSharedConfig::openConfig(), myConfigGroupName); + KConfigGroup group(KSharedConfig::openConfig(), mySnippetCustomFileAttachmentNameDialogGroupName); const QSize size = group.readEntry("Size", QSize(500, 150)); if (size.isValid()) { @@ -59,7 +59,7 @@ void SnippetCustomFileAttachmentNameDialog::readConfig() void SnippetCustomFileAttachmentNameDialog::writeConfig() { - KConfigGroup group(KSharedConfig::openConfig(), myConfigGroupName); + KConfigGroup group(KSharedConfig::openConfig(), mySnippetCustomFileAttachmentNameDialogGroupName); group.writeEntry("Size", size()); } diff --git a/src/snippets/snippetselectattachmentdialog.cpp b/src/snippets/snippetselectattachmentdialog.cpp index 9786279..491dd49 100644 --- a/src/snippets/snippetselectattachmentdialog.cpp +++ b/src/snippets/snippetselectattachmentdialog.cpp @@ -13,7 +13,7 @@ #include #include namespace { -static const char myConfigGroupName[] = "SnippetSelectAttachmentDialog"; +static const char mySnippetSelectAttachmentDialogGroupName[] = "SnippetSelectAttachmentDialog"; } using namespace MailCommon; SnippetSelectAttachmentDialog::SnippetSelectAttachmentDialog(QWidget *parent) @@ -57,13 +57,13 @@ QStringList SnippetSelectAttachmentDialog::attachments() const void SnippetSelectAttachmentDialog::writeConfig() { - KConfigGroup group(KSharedConfig::openConfig(), myConfigGroupName); + KConfigGroup group(KSharedConfig::openConfig(), mySnippetSelectAttachmentDialogGroupName); group.writeEntry("Size", size()); } void SnippetSelectAttachmentDialog::readConfig() { - KConfigGroup group(KSharedConfig::openConfig(), myConfigGroupName); + KConfigGroup group(KSharedConfig::openConfig(), mySnippetSelectAttachmentDialogGroupName); const QSize sizeDialog = group.readEntry("Size", QSize(300, 350)); if (sizeDialog.isValid()) { resize(sizeDialog);