gnucash-on-windows master: Multiple changes pushed

[Geert Janssens]

Updated	 via  https://github.com/Gnucash/gnucash-on-windows/commit/71864dc3 (commit)
	 via  https://github.com/Gnucash/gnucash-on-windows/commit/ffe8d7b3 (commit)
	from  https://github.com/Gnucash/gnucash-on-windows/commit/97fb8730 (commit)



commit 71864dc389bc2354e8a4f9eaa7bf0239d8bafd69
Author: Geert Janssens <geert at kobaltwit.be>
Date:   Sun Oct 6 22:15:19 2019 +0200

    Stop blocking glib schema compilation
    
    This is an additional step to get gnucash
    running directly from the build environment
    instead of having to make and run a Windows installer.
    With this you can run gnucash from a mingw32 shell as follows:
    XDG_DATA_DIRS="<mingw32-dir>/share" <path-to-gnucash>
    A bit more experimentation is needed to have that last bit
    set directly from the install step

diff --git a/gnucash.modules b/gnucash.modules
index 5956682..cf43c3f 100644
--- a/gnucash.modules
+++ b/gnucash.modules
@@ -277,7 +277,7 @@
   </cmake>
 
  <cmake id="gnucash"
-        cmakeargs="-DCMAKE_FIND_ROOT_PATH=$MSYS2ROOT -DCMAKE_PREFIX_PATH=$MSYS2ROOT -DPERL_EXECUTABLE=/usr/bin/perl -DGNC_DBD_DIR=$PREFIX/lib/dbd -DGTEST_ROOT=$SRCROOT/googletest/googletest -DGMOCK_ROOT=$SRCROOT/googletest/googlemock -DCOMPILE_GSCHEMAS=OFF">
+        cmakeargs="-DCMAKE_FIND_ROOT_PATH=$MSYS2ROOT -DCMAKE_PREFIX_PATH=$MSYS2ROOT -DPERL_EXECUTABLE=/usr/bin/perl -DGNC_DBD_DIR=$PREFIX/lib/dbd -DGTEST_ROOT=$SRCROOT/googletest/googletest -DGMOCK_ROOT=$SRCROOT/googletest/googlemock">
    <branch module="project/gnucash/gnucash%20%28stable%29/3.7/gnucash-3.7.tar.bz2"
 	   repo="sourceforge" version="3.7"/>
     <dependencies>
@@ -294,7 +294,7 @@
  </cmake>
 
  <cmake id="gnucash-git"
-        cmakeargs="-DCMAKE_FIND_ROOT_PATH=$MSYS2ROOT -DCMAKE_PREFIX_PATH=$MSYS2ROOT -DPERL_EXECUTABLE=/usr/bin/perl -DGNC_DBD_DIR=$PREFIX/lib/dbd -DGTEST_ROOT=$SRCROOT/googletest/googletest -DGMOCK_ROOT=$SRCROOT/googletest/googlemock -DCOMPILE_GSCHEMAS=OFF -DCMAKE_BUILD_TYPE=Debug">
+        cmakeargs="-DCMAKE_FIND_ROOT_PATH=$MSYS2ROOT -DCMAKE_PREFIX_PATH=$MSYS2ROOT -DPERL_EXECUTABLE=/usr/bin/perl -DGNC_DBD_DIR=$PREFIX/lib/dbd -DGTEST_ROOT=$SRCROOT/googletest/googletest -DGMOCK_ROOT=$SRCROOT/googletest/googlemock -DCMAKE_BUILD_TYPE=Debug">
    <branch repo="github" module="Gnucash/gnucash.git" revision="master"
 	   checkoutdir="gnucash-git"/>
     <dependencies>

commit ffe8d7b3b48313f649c73f5d1bd3c105dbc52717
Author: Geert Janssens <geert at kobaltwit.be>
Date:   Sun Oct 6 22:09:09 2019 +0200

    Switch to building with ninja
    
    The remaining issues were resolved recently and it looks
    ninja is less frequently stepping onto its own toes
    (no locked file errors as we had with make).

diff --git a/gnucash.modules b/gnucash.modules
index 718f8a0..5956682 100644
--- a/gnucash.modules
+++ b/gnucash.modules
@@ -277,8 +277,7 @@
   </cmake>
 
  <cmake id="gnucash"
-        cmakeargs="-G 'MSYS Makefiles' -DCMAKE_FIND_ROOT_PATH=$MSYS2ROOT -DCMAKE_PREFIX_PATH=$MSYS2ROOT -DPERL_EXECUTABLE=/usr/bin/perl -DGNC_DBD_DIR=$PREFIX/lib/dbd -DGTEST_ROOT=$SRCROOT/googletest/googletest -DGMOCK_ROOT=$SRCROOT/googletest/googlemock -DCOMPILE_GSCHEMAS=OFF"
-	use-ninja="False">
+        cmakeargs="-DCMAKE_FIND_ROOT_PATH=$MSYS2ROOT -DCMAKE_PREFIX_PATH=$MSYS2ROOT -DPERL_EXECUTABLE=/usr/bin/perl -DGNC_DBD_DIR=$PREFIX/lib/dbd -DGTEST_ROOT=$SRCROOT/googletest/googletest -DGMOCK_ROOT=$SRCROOT/googletest/googlemock -DCOMPILE_GSCHEMAS=OFF">
    <branch module="project/gnucash/gnucash%20%28stable%29/3.7/gnucash-3.7.tar.bz2"
 	   repo="sourceforge" version="3.7"/>
     <dependencies>
@@ -295,8 +294,7 @@
  </cmake>
 
  <cmake id="gnucash-git"
-        cmakeargs="-G 'MSYS Makefiles' -DCMAKE_FIND_ROOT_PATH=$MSYS2ROOT -DCMAKE_PREFIX_PATH=$MSYS2ROOT -DPERL_EXECUTABLE=/usr/bin/perl -DGNC_DBD_DIR=$PREFIX/lib/dbd -DGTEST_ROOT=$SRCROOT/googletest/googletest -DGMOCK_ROOT=$SRCROOT/googletest/googlemock -DCOMPILE_GSCHEMAS=OFF -DCMAKE_BUILD_TYPE=Debug"
-	use-ninja="False">
+        cmakeargs="-DCMAKE_FIND_ROOT_PATH=$MSYS2ROOT -DCMAKE_PREFIX_PATH=$MSYS2ROOT -DPERL_EXECUTABLE=/usr/bin/perl -DGNC_DBD_DIR=$PREFIX/lib/dbd -DGTEST_ROOT=$SRCROOT/googletest/googletest -DGMOCK_ROOT=$SRCROOT/googletest/googlemock -DCOMPILE_GSCHEMAS=OFF -DCMAKE_BUILD_TYPE=Debug">
    <branch repo="github" module="Gnucash/gnucash.git" revision="master"
 	   checkoutdir="gnucash-git"/>
     <dependencies>



Summary of changes:
 gnucash.modules | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)