Updating branch refs/heads/master
to 264582f557d045dafa2c377274a0edba99f95a46 (commit)
from aa1ffbf1d00567ee33b8968bab227734cdd685c0 (commit)
commit 264582f557d045dafa2c377274a0edba99f95a46
Author: Christian Dywan <[email protected]>
Date: Sun Jul 1 21:25:24 2012 +0200
Fix building of tests with GTK+3
tests/wscript_build | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/tests/wscript_build b/tests/wscript_build
index b1c0252..66735ae 100644
--- a/tests/wscript_build
+++ b/tests/wscript_build
@@ -33,8 +33,12 @@ for test in tests:
obj.includes = '.. ../midori ../panels'
obj.cflags = ['-DEXTENSION_PATH="' + os.path.abspath
('_build/default/extensions') + '"']
obj.source = source
- obj.vapi_dirs = '../midori'
- obj.packages = 'glib-2.0 gio-2.0 gtk+-2.0 libsoup-2.4 webkit-1.0 midori'
+ obj.vapi_dirs = '../midori ../katze'
+ obj.packages = 'glib-2.0 gio-2.0 libsoup-2.4 katze midori'
+ if bld.env['HAVE_GTK3']:
+ obj.packages += ' gtk+-3.0 webkitgtk-3.0'
+ else:
+ obj.packages += ' gtk+-2.0 webkit-1.0'
obj.uselib = 'UNIQUE LIBSOUP GIO GTK SQLITE WEBKIT LIBXML GRANITE'
obj.uselib_local = 'midori-core'
obj.unit_test = 1
_______________________________________________
Xfce4-commits mailing list
[email protected]
https://mail.xfce.org/mailman/listinfo/xfce4-commits
