gnucash master: Multiple changes pushed
Geert Janssens
gjanssens at code.gnucash.org
Sun Oct 6 15:57:00 EDT 2019
Updated via https://github.com/Gnucash/gnucash/commit/75073a7a (commit)
via https://github.com/Gnucash/gnucash/commit/f28cf416 (commit)
from https://github.com/Gnucash/gnucash/commit/1eb22c09 (commit)
commit 75073a7ab22b7feb701ebf51f4fc0873456ec662
Author: Geert Janssens <geert at kobaltwit.be>
Date: Sun Oct 6 21:27:10 2019 +0200
Tweak install rule to be able to compile glib's schema's on Windows as well
It's a bit of a hack based on the assumption DESTDIR is never set on Windows.
A install time guard is added to assert this.
It needed a few changes to make this working:
- Have cmake expand DESTDIR instead of delaying this to bash
If not, bash would see "$DESTDIRC:/gcdev64/..." and we'd loose
the drive letter in bash' expansion of $DESTDIRC.
So work with $ENV{DESTDIR} instead
- To prevent cmake from already expanding this in the
build system generation step add the appropriate escapes to
that variable.
- Add guard code in the install command that asserts
DESTDIR is not set on Windows. Use similar escapes as
necessary to ensure the evaluation happens at install time
rather than in the generation step.
commit f28cf4161183223119f3524a6e0af5e8d1bf453e
Author: Geert Janssens <geert at kobaltwit.be>
Date: Sun Oct 6 20:17:42 2019 +0200
Fix another dependency issue
This one popped up while experimenting on Windows.
In general: whenever a guile module (the ones created with
'define-module' load files (via 'load-from-path')
the loaded files must have been built before the
module. Otherwise targets depending on the module
may have dependency issues.
Summary of changes:
CMakeLists.txt | 2 ++
gnucash/gschemas/CMakeLists.txt | 18 ++++++++++++++----
gnucash/report/CMakeLists.txt | 20 ++++++++++----------
3 files changed, 26 insertions(+), 14 deletions(-)
More information about the gnucash-patches
mailing list