gnucash-on-osx master: Multiple changes pushed

[John Ralls]

Updated	 via  https://github.com/Gnucash/gnucash-on-osx/commit/6a7f2b17 (commit)
	 via  https://github.com/Gnucash/gnucash-on-osx/commit/a389491e (commit)
	from  https://github.com/Gnucash/gnucash-on-osx/commit/42824e37 (commit)



commit 6a7f2b17a2d9d382a4a0e5ad0d47c03be55c867c
Author: John Ralls <jralls at ceridwen.us>
Date:   Sat Feb 24 15:48:59 2018 -0800

    Release 2.7.5

diff --git a/modulesets/gnucash.modules b/modulesets/gnucash.modules
index 36f0ced..bd74718 100644
--- a/modulesets/gnucash.modules
+++ b/modulesets/gnucash.modules
@@ -262,8 +262,8 @@ for i in `ls $PREFIX/lib/libboost*.dylib`; do for j in `ls $PREFIX/lib/libboost*
 
 <cmake id="gnucash-unstable"
         cmakeargs="-DGTEST_ROOT=${JHBUILD_SOURCE}/googletest/googletest -DGMOCK_ROOT=${JHBUILD_SOURCE}/googletest/googlemock">
-   <branch repo="sourceforge" module="gnucash/unstable/gnucash-2.7.4.tar.bz2"
-           version="2.7.4" />
+   <branch repo="sourceforge" module="gnucash/unstable/gnucash-2.7.5.tar.bz2"
+           version="2.7.5" />
     <dependencies>
       <dep package="meta-gtk-osx-gtk3"/>
       <dep package="libofx"/>

commit a389491e64ba67574dbc2e6af47cdd0acecae775
Author: John Ralls <jralls at ceridwen.us>
Date:   Sat Feb 24 15:47:04 2018 -0800

    Replace  with .
    
    The latter is exported in .jhbuildrc, the latter is not.

diff --git a/modulesets/gnucash.modules b/modulesets/gnucash.modules
index ac8f3fc..36f0ced 100644
--- a/modulesets/gnucash.modules
+++ b/modulesets/gnucash.modules
@@ -261,7 +261,7 @@ for i in `ls $PREFIX/lib/libboost*.dylib`; do for j in `ls $PREFIX/lib/libboost*
 
 
 <cmake id="gnucash-unstable"
-        cmakeargs="-DGTEST_ROOT=${SRCROOT}/googletest/googletest -DGMOCK_ROOT=${SRCROOT}/googletest/googlemock">
+        cmakeargs="-DGTEST_ROOT=${JHBUILD_SOURCE}/googletest/googletest -DGMOCK_ROOT=${JHBUILD_SOURCE}/googletest/googlemock">
    <branch repo="sourceforge" module="gnucash/unstable/gnucash-2.7.4.tar.bz2"
            version="2.7.4" />
     <dependencies>
@@ -284,7 +284,7 @@ for i in `ls $PREFIX/lib/libboost*.dylib`; do for j in `ls $PREFIX/lib/libboost*
  </cmake>
 
  <cmake id="gnucash-git"
-        cmakeargs="-DCMAKE_INSTALL_RPATH_USE_LINK_PATH=ON -DGTEST_ROOT=${SRCROOT}/googletest/googletest -DGMOCK_ROOT=${SRCROOT}/googletest/googlemock">
+        cmakeargs="-DCMAKE_INSTALL_RPATH_USE_LINK_PATH=ON -DGTEST_ROOT=${JHBUILD_SOURCE}/googletest/googletest -DGMOCK_ROOT=${JHBUILD_SOURCE}/googletest/googlemock">
    <branch repo="github" module="Gnucash/gnucash.git" revision="master"
 	   checkoutdir="gnucash-git"/>
     <dependencies>



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