gnucash maint: Housekeeping - reduce the number of PACKAGE and VERSION related cmake variables
Geert Janssens
gjanssens at code.gnucash.org
Fri Jan 17 12:15:36 EST 2020
Updated via https://github.com/Gnucash/gnucash/commit/d8a304c2 (commit)
from https://github.com/Gnucash/gnucash/commit/aa961846 (commit)
commit d8a304c2c94a4f0d6c4167cfc1bf6e7f7e84d0cf
Author: Geert Janssens <geert at kobaltwit.be>
Date: Fri Jan 17 16:28:56 2020 +0100
Housekeeping - reduce the number of PACKAGE and VERSION related cmake variables
This starts by setting the gnucash version number in the 'project' call.
This will result in a number of variables set by cmake. The remainder
of this commit is to reuse the auto-generated
PROJECT_NAME, PROJECT_VERSION, PROJECT_VERSION_MAJOR
PROJECT_VERSION_MINOR, PROJECT_VERSION_PATCH and PROJECT_VERSION_TWEAK
instead of all the various instances of PACKAGE, GNUCASH_MAJOR_VERSION
and so on.
One parameter is worth mentioning - GETTEXT_PACKAGE
GnuCash is not using this directly (any more) but it has to be set before
including gi18n-lib.h.
Summary of changes:
CMakeLists.txt | 22 +++--------
common/config.h.cmake.in | 44 ++++++++++------------
gnucash/gnome-utils/gnc-embedded-window.c | 2 +-
gnucash/gnome-utils/gnc-main-window.c | 4 +-
gnucash/gnome-utils/gnc-plugin-menu-additions.c | 2 +-
gnucash/gnome-utils/gnc-plugin-page.c | 2 +-
gnucash/gnome/gnucash.desktop.in.in | 2 +-
gnucash/gnome/window-reconcile.c | 2 +-
gnucash/gnome/window-reconcile2.c | 2 +-
gnucash/gnucash-bin.c | 8 ++--
gnucash/gnucash.rc.in | 8 ++--
.../org.gnucash.dialogs.business.gschema.xml.in | 2 +-
...rg.gnucash.dialogs.checkprinting.gschema.xml.in | 2 +-
.../org.gnucash.dialogs.commodities.gschema.xml.in | 2 +-
.../org.gnucash.dialogs.export.csv.gschema.xml.in | 2 +-
.../gschemas/org.gnucash.dialogs.gschema.xml.in | 2 +-
.../org.gnucash.dialogs.import.csv.gschema.xml.in | 2 +-
...g.gnucash.dialogs.import.generic.gschema.xml.in | 2 +-
.../org.gnucash.dialogs.import.qif.gschema.xml.in | 2 +-
.../org.gnucash.dialogs.reconcile.gschema.xml.in | 2 +-
.../org.gnucash.dialogs.sxs.gschema.xml.in | 2 +-
.../org.gnucash.dialogs.totd.gschema.xml.in | 2 +-
...rg.gnucash.general.finance-quote.gschema.xml.in | 2 +-
gnucash/gschemas/org.gnucash.gschema.xml.in | 2 +-
.../gschemas/org.gnucash.history.gschema.xml.in | 2 +-
.../gschemas/org.gnucash.warnings.gschema.xml.in | 2 +-
...nucash.window.pages.account.tree.gschema.xml.in | 2 +-
.../org.gnucash.window.pages.gschema.xml.in | 2 +-
gnucash/import-export/aqb/gnc-ab-utils.c | 2 +-
.../org.gnucash.dialogs.import.hbci.gschema.xml.in | 2 +-
.../csv-imp/assistant-csv-trans-import.cpp | 2 +-
.../org.gnucash.dialogs.import.ofx.gschema.xml.in | 2 +-
libgnucash/app-utils/gnc-gsettings.c | 2 +-
libgnucash/backend/xml/sixtp-utils.cpp | 2 +-
libgnucash/core-utils/gnc-filepath-utils.cpp | 4 +-
libgnucash/core-utils/gnc-prefs.c | 2 +-
libgnucash/core-utils/gnc-version.c | 4 +-
.../test/test-userdata-dir-invalid-home.c | 8 ++--
libgnucash/core-utils/test/test-userdata-dir.c | 2 +-
libgnucash/doc/design/CMakeLists.txt | 4 +-
libgnucash/engine/gncAddress.h | 2 +-
libgnucash/engine/gncBillTerm.h | 2 +-
libgnucash/engine/gncCustomer.c | 2 +-
libgnucash/engine/gncEntry.h | 2 +-
libgnucash/engine/gncJob.c | 4 +-
libgnucash/engine/qof-backend.cpp | 2 +-
po/CMakeLists.txt | 4 +-
po/Makevars | 2 +-
po/glossary/txt-to-pot.sh | 6 +--
po/gnucash-pot.cmake | 6 +--
po/mni at bengali.po | 2 +-
po/ne.po | 2 +-
52 files changed, 93 insertions(+), 111 deletions(-)
More information about the gnucash-patches
mailing list