gnucash-on-windows master: Handle different GTEST_ROOT values for maint and master.
John Ralls
jralls at code.gnucash.org
Sat Sep 21 19:34:15 EDT 2019
Updated via https://github.com/Gnucash/gnucash-on-windows/commit/85730bd1 (commit)
from https://github.com/Gnucash/gnucash-on-windows/commit/49bd9779 (commit)
commit 85730bd178e6bfaf371e864b70a5832415655275
Author: John Ralls <jralls at ceridwen.us>
Date: Sat Sep 21 15:45:32 2019 -0700
Handle different GTEST_ROOT values for maint and master.
diff --git a/jhbuildrc.in b/jhbuildrc.in
index 4d86544..5ae55ed 100644
--- a/jhbuildrc.in
+++ b/jhbuildrc.in
@@ -84,3 +84,5 @@ module_extra_env["gnucash"]={'GUILE_LOAD_PATH':os.path.join(prefix, 'share', 'gu
module_extra_env["gnucash-git"]={'GUILE_LOAD_PATH':os.path.join(prefix, 'share', 'guile', '2.2'), 'GUILE_LOAD_COMPILED_PATH':os.path.join(prefix, 'lib', 'guile', '2.2', 'ccache')}
module_extra_env["gwenhywfar"]={'PKG_CONFIG': os.path.join('/', _arch, 'bin', 'pkg-config')}
+if _branch == 'master':
+ module_cmakeargs["gnucash-git"]=('-DGTEST_ROOT=$SRCROOT/googletest')
Summary of changes:
jhbuildrc.in | 2 ++
1 file changed, 2 insertions(+)
More information about the gnucash-changes
mailing list