gnucash-on-windows master: Fix googletest build/install errors

Geert Janssens gjanssens at code.gnucash.org
Tue Sep 5 17:47:11 EDT 2017


Updated	 via  https://github.com/Gnucash/gnucash-on-windows/commit/b81ed717 (commit)
	from  https://github.com/Gnucash/gnucash-on-windows/commit/bd1eaef3 (commit)



commit b81ed717e8d21464e7083ed442f67f8a06519ab4
Author: Geert Janssens <geert at kobaltwit.be>
Date:   Tue Sep 5 23:46:28 2017 +0200

    Fix googletest build/install errors
    
    - the way the jhbuild module was configured it ran cmake with both -G Ninja and
      -G 'Msys Makefiles'. Cmake apparently then only created makefiles but jhbuild
      still attempted to run ninja on it. Fixed by adding 'use-ninja=False'
    - The install step still failed after that. I have chosen to just disable installing
      as we're just inserting the source files in our tests rather than linking a lib

diff --git a/gnucash.modules b/gnucash.modules
index d070b7d..130e1bd 100644
--- a/gnucash.modules
+++ b/gnucash.modules
@@ -267,7 +267,10 @@
     </dependencies>
   </autotools>
 
-  <cmake id="googletest" cmakeargs="-G 'MSYS Makefiles' -DBUILD_GMOCK=OFF">
+  <cmake id="googletest"
+	 cmakeargs="-G 'MSYS Makefiles' -DBUILD_GMOCK=OFF"
+	 skip-install="True"
+	 use-ninja="False">
     <branch module="google/googletest" repo="github" tag="release-1.8.0"/>
   </cmake>
 



Summary of changes:
 gnucash.modules | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)



More information about the gnucash-changes mailing list