'[kmymoney] /: Disable most features for AppImage'

[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [kmymoney] /: Disable most features for AppImage
From:       Łukasz_Wojniłowicz <null () kde ! org>
Date:       2018-09-08 19:46:33
Message-ID: E1fyjBh-0000xi-0I () code ! kde ! org
[Download RAW message or body]

Git commit 0ff52bc8a4c3d935470bed2ed9d90690f174f511 by Łukasz Wojniłowicz.
Committed on 08/09/2018 at 19:46.
Pushed by wojnilowicz into branch 'master'.

Disable most features for AppImage

Differential Revision: https://phabricator.kde.org/D15343

M  +33   -24   CMakeLists.txt
M  +5    -5    config-kmymoney.h.cmake
M  +2    -5    kmymoney/CMakeLists.txt
M  +0    -1    kmymoney/dialogs/CMakeLists.txt
M  +1    -1    kmymoney/dialogs/settings/CMakeLists.txt
M  +2    -2    kmymoney/dialogs/settings/ksettingsschedules.cpp
M  +3    -3    kmymoney/kcreditswindow.cpp
M  +13   -16   kmymoney/kmymoney.cpp
M  +1    -1    kmymoney/mymoney/CMakeLists.txt
M  +6    -6    kmymoney/mymoney/mymoneycontact.cpp
M  +1    -1    kmymoney/plugins/xml/libkgpgfile/CMakeLists.txt
M  +2    -2    kmymoney/plugins/xml/libkgpgfile/kgpgfile.cpp
M  +1    -1    kmymoney/views/CMakeLists.txt
M  +1    -2    kmymoney/views/khomeview_p.h
M  +0    -1    kmymoney/views/kmymoneyview.cpp
M  +1    -1    kmymoney/views/kmymoneyview.h
M  +1    -1    kmymoney/views/kpayeesview_p.h
M  +14   -2    packaging/linux/appimage/build-kmymoney.sh

https://commits.kde.org/kmymoney/0ff52bc8a4c3d935470bed2ed9d90690f174f511

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 18f6f4fcb..b8b838537 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -50,9 +50,9 @@ find_package(PkgConfig)
 set (OPT_KF5_COMPONENTS DocTools Holidays Contacts Akonadi IdentityManagement \
Activities)  find_package(Gpgmepp)
 if (Gpgmepp_FOUND)
-  set(GPG_ENCRYPTION ON)
+  set(GPG_FOUND TRUE)
 else()
-  set(GPG_ENCRYPTION OFF)
+  set(GPG_FOUND FALSE)
   list(APPEND OPT_KF5_COMPONENTS Gpgmepp)
 endif()
 
@@ -75,14 +75,16 @@ find_package(LibAlkimia5 7.0.0 REQUIRED)
 #  include_directories(${GMP_INCLUDE_DIR})
 #endif()
 
-find_package(KChart 2.6.0 REQUIRED)
+find_package(KChart 2.6.0)
 
 if(KF5Gpgmepp_FOUND)
-  set(GPG_ENCRYPTION ON)
-  add_definitions(-DGpgmepp_FOUND)
+  set(GPG_FOUND TRUE)
 endif()
 
-add_feature_info("Encryption" GPG_ENCRYPTION "It allows encrypting your financial \
data.") +cmake_dependent_option(ENABLE_GPG "Enable GPG support." ON
+                       "GPG_FOUND" OFF)
+
+add_feature_info("Encryption" ENABLE_GPG "Allows to store your financial data using \
strong GPG encryption.")  
 add_definitions(-DQT_USE_QSTRINGBUILDER -DQT_NO_CAST_TO_ASCII \
-DQT_NO_URL_CAST_FROM_STRING)  set(CMAKE_CXX_STANDARD 14)
@@ -130,26 +132,33 @@ get_filename_component(QT_DIR     ${QT_BIN_DIR}        PATH)
 set(QT_INSTALL_DIR ${QT_DIR} CACHE PATH
   "Qt install prefix defaults to the Qt prefix: ${QT_DIR}")
 
-if(KF5IdentityManagement_FOUND AND KF5Akonadi_FOUND AND KF5Contacts_FOUND)
-  set(KMM_ADDRESSBOOK_FOUND true)
-endif()
+cmake_dependent_option(ENABLE_ADDRESSBOOK "Enable addressbook support." ON
+                       \
"KF5IdentityManagement_FOUND;KF5Akonadi_FOUND;KF5Contacts_FOUND" OFF) +
+add_feature_info("Address book" ENABLE_ADDRESSBOOK "Allows fetching payee \
information from KDE PIM system.") +
+cmake_dependent_option(ENABLE_HOLIDAYS "Enable addressbook support." ON
+                       "KF5Holidays_FOUND" OFF)
+
+add_feature_info("Holidays" ENABLE_HOLIDAYS "Allows fetching holidays from KDE PIM \
system.")  
-add_feature_info("Address book" KMM_ADDRESSBOOK_FOUND "It allows fetching payee \
                information from KDE PIM system.")
-add_feature_info("Holidays" KF5Holidays_FOUND "It allows fetching holidays from KDE \
PIM system.") +cmake_dependent_option(ENABLE_ACTIVITIES "Enable activities support." \
ON +                       "KF5Activities_FOUND" OFF)
 
 option(ENABLE_FORECASTVIEW "Enable forecast view" ON)
-add_feature_info("Forecast view" ENABLE_FORECASTVIEW "It adds possibility to \
                calculate forecasts.")
-option(ENABLE_REPORTSVIEW "Enable reports view" ON)
-add_feature_info("Reports view" ENABLE_REPORTSVIEW "It adds possibility to display \
chart and table reports.") +add_feature_info("Forecast view" ENABLE_FORECASTVIEW \
"Adds possibility to calculate forecasts.") \
+cmake_dependent_option(ENABLE_REPORTSVIEW "Enable reports view." ON +                \
"KChart_FOUND" OFF) +add_feature_info("Reports view" ENABLE_REPORTSVIEW "Adds \
possibility to display chart and table reports.")  option(ENABLE_BUDGETVIEW "Enable \
                budget view" ON)
-add_feature_info("Budget view" ENABLE_BUDGETVIEW "It adds possibility to plan a \
budget.") +add_feature_info("Budget view" ENABLE_BUDGETVIEW "Adds possibility to plan \
a budget.")  option(ENABLE_ONLINEJOBOUTBOXVIEW "Enable online job outbox view" ON)
-add_feature_info("Online job outbox view" ENABLE_ONLINEJOBOUTBOXVIEW "It adds outbox \
for sending online jobs.") +add_feature_info("Online job outbox view" \
ENABLE_ONLINEJOBOUTBOXVIEW "Adds outbox for sending online jobs.")  
 cmake_dependent_option(ENABLE_SQLSTORAGE "Enable SQL storage support." ON
                        "Qt5Sql_FOUND" OFF)
 
-add_feature_info("SQL Storage" ENABLE_SQLSTORAGE "It allows storing your financial \
data in SQL database.") +add_feature_info("SQL Storage" ENABLE_SQLSTORAGE "Allows \
storing your financial data in SQL database.")  
 cmake_dependent_option(ENABLE_SQLCIPHER "Enable SQLCipher support." ON
                        "SQLCIPHER_FOUND" OFF)
@@ -161,7 +170,7 @@ if(ENABLE_SQLCIPHER AND (NOT CMAKE_SYSTEM_NAME MATCHES "Linux" OR \
CMAKE_VERSION  link_directories(${SQLCIPHER_LIBRARY_DIRS})
 endif()
 
-add_feature_info("SQLCipher" ENABLE_SQLCIPHER "It allows encrypting your SQLite3 \
database.") +add_feature_info("SQLCipher" ENABLE_SQLCIPHER "Allows encrypting your \
SQLite3 database.")  
 cmake_dependent_option(ENABLE_IBANBICDATA "Enable IBAN/BIC data support." OFF
                        "Qt5Sql_FOUND" OFF)
@@ -204,7 +213,7 @@ else()
   unset(LIBOFX_HAVE_CLIENTUID CACHE)
 endif(ENABLE_OFXIMPORTER)
 
-add_feature_info("OFX Importer" ENABLE_OFXIMPORTER "It allows importing OFX files \
(have client uid version: ${nice_LIBOFX_HAVE_CLIENTUID})" ) +add_feature_info("OFX \
Importer" ENABLE_OFXIMPORTER "Allows importing OFX files (have client uid version: \
${nice_LIBOFX_HAVE_CLIENTUID})" )  
 # check for optional KBanking support
 find_package(AQBANKING 5.6.5)
@@ -247,16 +256,16 @@ add_feature_info(iCalendar ENABLE_LIBICAL "iCalendar \
integration.")  
 option(ENABLE_QIFIMPORTER "Enable QIF Importer" ON)
 option(ENABLE_QIFEXPORTER "Enable QIF Exporter" ON)
-add_feature_info("QIF Importer" ENABLE_QIFIMPORTER "It allows importing QIF files.")
-add_feature_info("QIF Exporter" ENABLE_QIFEXPORTER "It allows exporting QIF files.")
+add_feature_info("QIF Importer" ENABLE_QIFIMPORTER "Allows importing QIF files.")
+add_feature_info("QIF Exporter" ENABLE_QIFEXPORTER "Allows exporting QIF files.")
 
 option(ENABLE_GNCIMPORTER "Enable GNC Importer" ON)
-add_feature_info("GNC Importer" ENABLE_GNCIMPORTER "It allows importing GNUCash \
files.") +add_feature_info("GNC Importer" ENABLE_GNCIMPORTER "Allows importing \
GNUCash files.")  
 option(ENABLE_CSVIMPORTER "Enable CSV Importer" ON)
 option(ENABLE_CSVEXPORTER "Enable CSV Exporter" ON)
-add_feature_info("CSV Importer" ENABLE_CSVIMPORTER "It allows importing CSV files.")
-add_feature_info("CSV Exporter" ENABLE_CSVEXPORTER "It allows exporting CSV files.")
+add_feature_info("CSV Importer" ENABLE_CSVIMPORTER "Allows importing CSV files.")
+add_feature_info("CSV Exporter" ENABLE_CSVEXPORTER "Allows exporting CSV files.")
 
 option(ENABLE_UNFINISHEDFEATURES "For devs only" OFF)
 
diff --git a/config-kmymoney.h.cmake b/config-kmymoney.h.cmake
index eadb8e39d..8611c59aa 100644
--- a/config-kmymoney.h.cmake
+++ b/config-kmymoney.h.cmake
@@ -7,16 +7,16 @@
 
 #cmakedefine KMM_DBUS 1
 
-#cmakedefine KF5Holidays_FOUND 1
+#cmakedefine ENABLE_HOLIDAYS 1
 
-#cmakedefine Gpgmepp_FOUND 1
+#cmakedefine ENABLE_ADDRESSBOOK 1
 
-#cmakedefine KMM_ADDRESSBOOK_FOUND 1
-
-#cmakedefine KF5Activities_FOUND 1
+#cmakedefine ENABLE_ACTIVITIES 1
 
 #cmakedefine ENABLE_WEBENGINE 1
 
 #cmakedefine ENABLE_UNFINISHEDFEATURES 1
 
 #cmakedefine ENABLE_SQLCIPHER 1
+
+#cmakedefine ENABLE_GPG 1
diff --git a/kmymoney/CMakeLists.txt b/kmymoney/CMakeLists.txt
index 3860461da..2abacf927 100644
--- a/kmymoney/CMakeLists.txt
+++ b/kmymoney/CMakeLists.txt
@@ -152,15 +152,12 @@ target_link_libraries(kmymoney
   interfaces
   kmm_plugin
   Qt5::Core
-  KF5::Archive
   KF5::ConfigGui
   KF5::WidgetsAddons
-  KF5::KIOCore
   KF5::CoreAddons
-  KChart
   $<$<BOOL:${USE_MODELTEST}>:Qt5::Test>
-  $<$<BOOL:${KF5Holidays_FOUND}>:KF5::Holidays>
-  $<$<BOOL:${KF5Activities_FOUND}>:KF5::Activities>
+  $<$<BOOL:${ENABLE_HOLIDAYS}>:KF5::Holidays>
+  $<$<BOOL:${ENABLE_ACTIVITIES}>:KF5::Activities>
   PRIVATE
     $<$<BOOL:${ENABLE_SQLCIPHER}>:sqlcipher>
 )
diff --git a/kmymoney/dialogs/CMakeLists.txt b/kmymoney/dialogs/CMakeLists.txt
index 90140617b..23b3d9176 100644
--- a/kmymoney/dialogs/CMakeLists.txt
+++ b/kmymoney/dialogs/CMakeLists.txt
@@ -76,7 +76,6 @@ add_library(dialogs STATIC ${libdialogs_a_SOURCES})
 
 target_link_libraries(dialogs
   PUBLIC
-    KChart
     KF5::ItemViews
     KF5::I18n
     KF5::TextWidgets
diff --git a/kmymoney/dialogs/settings/CMakeLists.txt \
b/kmymoney/dialogs/settings/CMakeLists.txt index d8cc52a07..69039e3bf 100644
--- a/kmymoney/dialogs/settings/CMakeLists.txt
+++ b/kmymoney/dialogs/settings/CMakeLists.txt
@@ -40,7 +40,7 @@ target_link_libraries(settings PUBLIC
   Alkimia::alkimia
 )
 
-if (KF5Holidays_FOUND)
+if (ENABLE_HOLIDAYS)
   target_link_libraries(settings PUBLIC KF5::Holidays)
 endif()
 
diff --git a/kmymoney/dialogs/settings/ksettingsschedules.cpp \
b/kmymoney/dialogs/settings/ksettingsschedules.cpp index 13298be58..4be7b5026 100644
--- a/kmymoney/dialogs/settings/ksettingsschedules.cpp
+++ b/kmymoney/dialogs/settings/ksettingsschedules.cpp
@@ -27,7 +27,7 @@
 // KDE Includes
 
 #include <KLocalizedString>
-#ifdef KF5Holidays_FOUND
+#ifdef ENABLE_HOLIDAYS
 #include <KHolidays/Holiday>
 #include <KHolidays/HolidayRegion>
 using namespace KHolidays;
@@ -86,7 +86,7 @@ void KSettingsSchedules::loadList()
 {
   Q_D(KSettingsSchedules);
   QStringList regions;
-#ifdef KF5Holidays_FOUND
+#ifdef ENABLE_HOLIDAYS
   QStringList regionCodes = HolidayRegion::regionCodes();
 
   foreach (const QString &regionCode, regionCodes) {
diff --git a/kmymoney/kcreditswindow.cpp b/kmymoney/kcreditswindow.cpp
index facef92f5..18e1dceff 100644
--- a/kmymoney/kcreditswindow.cpp
+++ b/kmymoney/kcreditswindow.cpp
@@ -37,13 +37,13 @@ KAboutData initializeCreditsData()
   if (!aboutData.homepage().isEmpty())
     return aboutData;
   QStringList features;
-#ifdef Gpgmepp_FOUND
+#ifdef ENABLE_GPG
   features << i18n("GPG encryption");
 #endif
-#ifdef KMM_ADDRESSBOOK_FOUND
+#ifdef ENABLE_ADDRESSBOOK
   features << i18n("Addressbook integration");
 #endif
-#ifdef KF5Holidays_FOUND
+#ifdef ENABLE_HOLIDAYS
   features << i18n("Holiday regions integration");
 #endif
 
diff --git a/kmymoney/kmymoney.cpp b/kmymoney/kmymoney.cpp
index 9a7ee0b1e..d340a3d61 100644
--- a/kmymoney/kmymoney.cpp
+++ b/kmymoney/kmymoney.cpp
@@ -67,15 +67,12 @@
 #include <KRecentDirs>
 #include <KProcess>
 #include <KAboutApplicationDialog>
-#include <KIO/StoredTransferJob>
-#include <KJobWidgets>
-#include <KCompressionDevice>
 #include <KBackup>
-#ifdef KF5Holidays_FOUND
+#ifdef ENABLE_HOLIDAYS
 #include <KHolidays/Holiday>
 #include <KHolidays/HolidayRegion>
 #endif
-#ifdef KF5Activities_FOUND
+#ifdef ENABLE_ACTIVITIES
 #include <KActivities/ResourceInstance>
 #endif
 
@@ -220,10 +217,10 @@ public:
       m_autoSavePeriod(0),
       m_inAutoSaving(false),
       m_recentFiles(nullptr),
-#ifdef KF5Holidays_FOUND
+#ifdef ENABLE_HOLIDAYS
       m_holidayRegion(nullptr),
 #endif
-#ifdef KF5Activities_FOUND
+#ifdef ENABLE_ACTIVITIES
       m_activityResourceInstance(nullptr),
 #endif
       m_applicationIsReady(true),
@@ -312,12 +309,12 @@ public:
 
   KRecentFilesAction*   m_recentFiles;
 
-#ifdef KF5Holidays_FOUND
+#ifdef ENABLE_HOLIDAYS
   // used by the calendar interface for schedules
   KHolidays::HolidayRegion* m_holidayRegion;
 #endif
 
-#ifdef KF5Activities_FOUND
+#ifdef ENABLE_ACTIVITIES
   KActivities::ResourceInstance * m_activityResourceInstance;
 #endif
 
@@ -1201,7 +1198,7 @@ KMyMoneyApp::KMyMoneyApp(QWidget* parent) :
   connect(d->m_myMoneyView, &KMyMoneyView::statusProgress, this, \
&KMyMoneyApp::slotStatusProgressBar);  
   // Initialize kactivities resource instance
-#ifdef KF5Activities_FOUND
+#ifdef ENABLE_ACTIVITIES
   d->m_activityResourceInstance = new \
KActivities::ResourceInstance(window()->winId(), this);  #endif
 
@@ -1264,11 +1261,11 @@ KMyMoneyApp::~KMyMoneyApp()
   KMyMoneyPlugin::pluginHandling(KMyMoneyPlugin::Action::Unload, pPlugins, this, \
guiFactory());  d->removeStorage();
 
-#ifdef KF5Holidays_FOUND
+#ifdef ENABLE_HOLIDAYS
   delete d->m_holidayRegion;
 #endif
 
-#ifdef KF5Activities_FOUND
+#ifdef ENABLE_ACTIVITIES
   delete d->m_activityResourceInstance;
 #endif
 
@@ -3260,7 +3257,7 @@ void KMyMoneyApp::slotDateChanged()
 
 void KMyMoneyApp::setHolidayRegion(const QString& holidayRegion)
 {
-#ifdef KF5Holidays_FOUND
+#ifdef ENABLE_HOLIDAYS
   //since the cost of updating the cache is now not negligible
   //check whether the region has been modified
   if (!d->m_holidayRegion || d->m_holidayRegion->regionCode() != holidayRegion) {
@@ -3281,7 +3278,7 @@ bool KMyMoneyApp::isProcessingDate(const QDate& date) const
 {
   if (!d->m_processingDays.testBit(date.dayOfWeek()))
     return false;
-#ifdef KF5Holidays_FOUND
+#ifdef ENABLE_HOLIDAYS
   if (!d->m_holidayRegion || !d->m_holidayRegion->isValid())
     return true;
 
@@ -3300,7 +3297,7 @@ bool KMyMoneyApp::isProcessingDate(const QDate& date) const
 
 void KMyMoneyApp::preloadHolidays()
 {
-#ifdef KF5Holidays_FOUND
+#ifdef ENABLE_HOLIDAYS
   //clear the cache before loading
   d->m_holidayMap.clear();
   //only do this if it is a valid region
@@ -3637,7 +3634,7 @@ void KMyMoneyApp::Private::fileAction(eKMyMoney::FileAction \
action)  onlineJobAdministration::instance()->updateOnlineTaskProperties();
       q->connect(MyMoneyFile::instance(), &MyMoneyFile::dataChanged, q, \
&KMyMoneyApp::slotDataChanged);  
-#ifdef KF5Activities_FOUND
+#ifdef ENABLE_ACTIVITIES
       m_activityResourceInstance->setUri(m_storageInfo.url);
 #endif
       break;
diff --git a/kmymoney/mymoney/CMakeLists.txt b/kmymoney/mymoney/CMakeLists.txt
index 5d7fa1558..0042e4c3e 100644
--- a/kmymoney/mymoney/CMakeLists.txt
+++ b/kmymoney/mymoney/CMakeLists.txt
@@ -96,7 +96,7 @@ target_link_libraries(kmm_mymoney
                       onlinetask_interfaces
 )
 
-if(KMM_ADDRESSBOOK_FOUND)
+if(ENABLE_ADDRESSBOOK)
 target_link_libraries(kmm_mymoney PUBLIC KF5::IdentityManagement KF5::AkonadiCore \
KF5::Contacts)  endif()
 
diff --git a/kmymoney/mymoney/mymoneycontact.cpp \
b/kmymoney/mymoney/mymoneycontact.cpp index afa88206d..bb7839eea 100644
--- a/kmymoney/mymoney/mymoneycontact.cpp
+++ b/kmymoney/mymoney/mymoneycontact.cpp
@@ -19,7 +19,7 @@
 
 #include "mymoneycontact.h"
 
-#ifdef KMM_ADDRESSBOOK_FOUND
+#ifdef ENABLE_ADDRESSBOOK
 #include <KIdentityManagement/IdentityManager>
 #include <KIdentityManagement/Identity>
 #include <AkonadiCore/RecursiveItemFetchJob>
@@ -35,7 +35,7 @@ MyMoneyContact::MyMoneyContact(QObject *parent) : QObject(parent)
 
 bool MyMoneyContact::ownerExists() const
 {
-#ifdef KMM_ADDRESSBOOK_FOUND
+#ifdef ENABLE_ADDRESSBOOK
   KIdentityManagement::IdentityManager im;
   KIdentityManagement::Identity id = im.defaultIdentity();
   return !id.isNull();
@@ -46,7 +46,7 @@ bool MyMoneyContact::ownerExists() const
 
 QString MyMoneyContact::ownerEmail() const
 {
-#ifdef KMM_ADDRESSBOOK_FOUND
+#ifdef ENABLE_ADDRESSBOOK
   KIdentityManagement::IdentityManager im;
   KIdentityManagement::Identity id = im.defaultIdentity();
   return id.primaryEmailAddress();
@@ -57,7 +57,7 @@ QString MyMoneyContact::ownerEmail() const
 
 QString MyMoneyContact::ownerFullName() const
 {
-#ifdef KMM_ADDRESSBOOK_FOUND
+#ifdef ENABLE_ADDRESSBOOK
   KIdentityManagement::IdentityManager im;
   KIdentityManagement::Identity id = im.defaultIdentity();
   return id.fullName();
@@ -68,7 +68,7 @@ QString MyMoneyContact::ownerFullName() const
 
 void MyMoneyContact::fetchContact(const QString &email)
 {
-#ifdef KMM_ADDRESSBOOK_FOUND
+#ifdef ENABLE_ADDRESSBOOK
   QRegularExpression re(".+@.+");
   if (!re.match(email).hasMatch()) {
     ContactData contact;
@@ -91,7 +91,7 @@ void MyMoneyContact::fetchContact(const QString &email)
 
 void MyMoneyContact::searchContactResult(KJob *job)
 {
-#ifdef KMM_ADDRESSBOOK_FOUND
+#ifdef ENABLE_ADDRESSBOOK
   const Akonadi::RecursiveItemFetchJob *contactJob = \
qobject_cast<Akonadi::RecursiveItemFetchJob*>(job);  Akonadi::Item::List items;
   if (contactJob)
diff --git a/kmymoney/plugins/xml/libkgpgfile/CMakeLists.txt \
b/kmymoney/plugins/xml/libkgpgfile/CMakeLists.txt index ee5206d52..cee6dc9bb 100644
--- a/kmymoney/plugins/xml/libkgpgfile/CMakeLists.txt
+++ b/kmymoney/plugins/xml/libkgpgfile/CMakeLists.txt
@@ -5,7 +5,7 @@ set(kgpgfile_STAT_SRCS
 add_library(kgpgfile STATIC ${kgpgfile_STAT_SRCS})
 target_link_libraries(kgpgfile PUBLIC Qt5::Core)
 
-if(Gpgmepp_FOUND OR KF5Gpgmepp_FOUND)
+if(ENABLE_GPG)
   if(WIN32)
     find_package(KDEWin REQUIRED)
     target_include_directories(kgpgfile PUBLIC ${KDEWIN_INCLUDES})
diff --git a/kmymoney/plugins/xml/libkgpgfile/kgpgfile.cpp \
b/kmymoney/plugins/xml/libkgpgfile/kgpgfile.cpp index 8efa03a35..bf74a594b 100644
--- a/kmymoney/plugins/xml/libkgpgfile/kgpgfile.cpp
+++ b/kmymoney/plugins/xml/libkgpgfile/kgpgfile.cpp
@@ -37,7 +37,7 @@
 // ----------------------------------------------------------------------------
 // KDE Includes
 
-#ifdef Gpgmepp_FOUND
+#ifdef ENABLE_GPG
 #include <gpgme++/context.h>
 #include <gpgme++/encryptionresult.h>
 #include <gpgme++/decryptionresult.h>
@@ -378,7 +378,7 @@ void KGPGFile::keyList(QStringList& list, bool secretKeys, const \
QString& patter  }
 }
 
-#else // not Gpgmepp_FOUND
+#else // not ENABLE_GPG
 
 // NOOP implementation
 KGPGFile::KGPGFile(const QString& fn, const QString& homedir, const QString& \
                options) : d(0)
diff --git a/kmymoney/views/CMakeLists.txt b/kmymoney/views/CMakeLists.txt
index e6d8b7988..4cc82b7b3 100644
--- a/kmymoney/views/CMakeLists.txt
+++ b/kmymoney/views/CMakeLists.txt
@@ -62,7 +62,7 @@ ki18n_wrap_ui(libviews_a_SOURCES ${libviews_a_UI})
 
 add_library(views STATIC ${libviews_a_SOURCES})
 
-target_link_libraries(views PUBLIC newaccountwizard KChart KF5::KIOFileWidgets \
KF5::Notifications KF5::Archive KF5::TextWidgets Qt5::PrintSupport Alkimia::alkimia) \
+target_link_libraries(views PUBLIC newaccountwizard KF5::TextWidgets \
Qt5::PrintSupport)  
 if(ENABLE_WEBENGINE)
  target_link_libraries(views PUBLIC Qt5::WebEngineWidgets)
diff --git a/kmymoney/views/khomeview_p.h b/kmymoney/views/khomeview_p.h
index e65656fb8..efda5a177 100644
--- a/kmymoney/views/khomeview_p.h
+++ b/kmymoney/views/khomeview_p.h
@@ -39,6 +39,7 @@
 #include <QUrlQuery>
 #include <QWheelEvent>
 #include <QPrintDialog>
+#include <QVBoxLayout>
 #include <QPrinter>
 #include <QPointer>
 #ifdef ENABLE_WEBENGINE
@@ -51,8 +52,6 @@
 // ----------------------------------------------------------------------------
 // KDE Includes
 
-#include <KChartAbstractCoordinatePlane>
-#include <KChartChart>
 #include <KLocalizedString>
 #include <KXmlGuiWindow>
 #include <KActionCollection>
diff --git a/kmymoney/views/kmymoneyview.cpp b/kmymoney/views/kmymoneyview.cpp
index 6cbef8bda..47736f352 100644
--- a/kmymoney/views/kmymoneyview.cpp
+++ b/kmymoney/views/kmymoneyview.cpp
@@ -42,7 +42,6 @@
 
 #include <KMessageBox>
 #include <KTitleWidget>
-#include <KCompressionDevice>
 #include <KSharedConfig>
 #include <KBackup>
 #include <KActionCollection>
diff --git a/kmymoney/views/kmymoneyview.h b/kmymoney/views/kmymoneyview.h
index 77aa4132e..f7e9527d2 100644
--- a/kmymoney/views/kmymoneyview.h
+++ b/kmymoney/views/kmymoneyview.h
@@ -34,7 +34,7 @@
 // Project Includes
 #include "selectedtransactions.h"
 
-#ifdef KF5Activities_FOUND
+#ifdef ENABLE_ACTIVITIES
 namespace KActivities
 {
 class ResourceInstance;
diff --git a/kmymoney/views/kpayeesview_p.h b/kmymoney/views/kpayeesview_p.h
index a011fea6f..38dd2addb 100644
--- a/kmymoney/views/kpayeesview_p.h
+++ b/kmymoney/views/kpayeesview_p.h
@@ -190,7 +190,7 @@ public:
 
     ui->m_updateButton->setEnabled(false);
     ui->m_syncAddressbook->setEnabled(false);
-    #ifndef KMM_ADDRESSBOOK_FOUND
+    #ifndef ENABLE_ADDRESSBOOK
     ui->m_syncAddressbook->hide();
     #endif
     ui->matchTypeCombo->setCurrentIndex(0);
diff --git a/packaging/linux/appimage/build-kmymoney.sh \
b/packaging/linux/appimage/build-kmymoney.sh index ade0b7d6d..894e2a55a 100755
--- a/packaging/linux/appimage/build-kmymoney.sh
+++ b/packaging/linux/appimage/build-kmymoney.sh
@@ -37,9 +37,21 @@ CPU_COUNT=`grep processor /proc/cpuinfo | wc -l`
 # Configure KMyMoney
 cmake $KMYMONEY_SOURCES \
     -DCMAKE_INSTALL_PREFIX:PATH=$BUILD_PREFIX/kmymoney.appdir/usr \
-    -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_BUILD_TYPE=RelWithDebInfo \
     -DBUILD_TESTING=FALSE \
-    -DENABLE_WEBENGINE=TRUE
+    -DENABLE_WEBENGINE=TRUE \
+    -DENABLE_SQLCIPHER=FALSE \
+    -DENABLE_SQLSTORAGE=FALSE \
+    -DENABLE_KBANKING=FALSE \
+    -DENABLE_ONLINEJOBOUTBOXVIEW=FALSE \
+    -DENABLE_OFXIMPORTER=FALSE \
+    -DENABLE_ADDRESSBOOK=FALSE \
+    -DENABLE_HOLIDAYS=FALSE \
+    -DENABLE_ACTIVITIES=FALSE \
+    -DENABLE_FORECASTVIEW=FALSE \
+    -DENABLE_REPORTSVIEW=FALSE \
+    -DENABLE_BUDGETVIEW=FALSE \
+    -DENABLE_GPG=FALSE
 
 # Build and Install KMyMoney (ready for the next phase)
 make -j$CPU_COUNT install


[prev in list] [next in list] [prev in thread] [next in thread]
Configure | About | News | Add a list | Sponsored by KoreLogic