gnucash-on-osx master: Add googletest module, dependency for master branch.

[John Ralls]

Updated	 via  https://github.com/Gnucash/gnucash-on-osx/commit/8c590b16 (commit)
	from  https://github.com/Gnucash/gnucash-on-osx/commit/7334ab3a (commit)



commit 8c590b1696bf97a7dfc0d394ea2dfd9392d77b6a
Author: John Ralls <jralls at ceridwen.us>
Date:   Tue Mar 7 14:14:51 2017 -0800

    Add googletest module, dependency for master branch.

diff --git a/modulesets/gnucash.modules b/modulesets/gnucash.modules
index 7b24c30..44d8f33 100644
--- a/modulesets/gnucash.modules
+++ b/modulesets/gnucash.modules
@@ -222,6 +222,10 @@ for i in `ls $PREFIX/lib/libboost*`; do install_name_tool -id $i $i; done
 	    version="1.56.0"/>
   </autotools>
 
+  <cmake id="googletest" cmakeargs="-DBUILD_GMOCK=OFF">
+    <branch module="google/googletest" repo="github" tag="release-1.8.0"/>
+  </cmake>
+
   <autotools id="gnucash"
 	     autogen-sh="configure"
 	     autogenargs="--enable-ofx --enable-aqbanking --enable-binreloc --enable-dbi --with-dbi-dbd-dir=$PREFIX/lib/dbd --with-html-engine='webkit'">
@@ -246,9 +250,8 @@ for i in `ls $PREFIX/lib/libboost*`; do install_name_tool -id $i $i; done
 
   </autotools>
 
- <autotools id="gnucash-git"
-	    autogen-template="%(srcdir)s/%(autogen-sh)s && %(srcdir)s/configure --prefix %(prefix)s %(autogenargs)s"
-	    autogenargs='--enable-ofx --enable-aqbanking --enable-binreloc --enable-dbi --with-dbi-dbd-dir=$PREFIX/lib/dbd --with-html-engine="webkit"'>
+ <cmake id="gnucash-git"
+        cmakeargs="-DGTEST_ROOT=${SRCROOT}/googletest/googletest -DGMOCK_ROOT=${SRCROOT}/googletest/googlemock">
    <branch repo="github" module="Gnucash/gnucash.git" revision="master"
 	   checkoutdir="gnucash-git"/>
     <dependencies>
@@ -264,13 +267,14 @@ for i in `ls $PREFIX/lib/libboost*`; do install_name_tool -id $i $i; done
       <dep package="guile2"/>
       <dep package="swig"/>
       <dep package="boost"/>
+      <dep package="googletest"/>
     </dependencies>
     <after>
       <dep package="meta-gtk-osx-webkit1.6"/>
       <dep package="meta-gtk-osx-webkit"/>
     </after>
 
-  </autotools>
+ </cmake>
 
   <autotools id="gnucash-docs-git" autogenargs="--disable-scrollkeeper"
 	    autogen-template="%(srcdir)s/%(autogen-sh)s && %(srcdir)s/configure --prefix %(prefix)s %(autogenargs)s"



Summary of changes:
 modulesets/gnucash.modules | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)