]> spindle.queued.net Git - midori/commitdiff
Fix building of tests with GTK+3
authorChristian Dywan <christian@twotoasts.de>
Sun, 1 Jul 2012 19:25:24 +0000 (21:25 +0200)
committerChristian Dywan <christian@twotoasts.de>
Sun, 1 Jul 2012 19:26:06 +0000 (21:26 +0200)
tests/wscript_build

index b1c02528e36e6d48f9c71d1a06e35ff58a56a9a8..66735ae75a5f3d6382c4a622f00d0894e9d3998e 100644 (file)
@@ -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