summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorNirbheek Chauhan <nirbheek@centricular.com>2017-05-19 11:58:44 +0100
committerEmmanuele Bassi <ebassi@gnome.org>2017-05-19 17:32:28 +0100
commit09623d50ac8afd9b246e571372972142af5daaa3 (patch)
tree6d111164637f3756a3c2d90018763b5dafbf02e9 /tests
parent5d3af9bf597cf42bd39bf2e4275c7f0746a947b5 (diff)
downloadpango-09623d50ac8afd9b246e571372972142af5daaa3.tar.gz
meson: Add a few missing things, minor fixes, TODO
Diffstat (limited to 'tests')
-rw-r--r--tests/meson.build12
1 files changed, 6 insertions, 6 deletions
diff --git a/tests/meson.build b/tests/meson.build
index 1a21101b..d69a0d0d 100644
--- a/tests/meson.build
+++ b/tests/meson.build
@@ -6,11 +6,7 @@ if xft_dep.found()
test_cflags += [ '-DHAVE_X', '-DHAVE_XFT' ]
endif
-if freetype_dep.found()
- test_cflags += '-DHAVE_FREETYPE'
-endif
-
-if host_system.contains('windows')
+if host_system == 'windows'
test_cflags += '-DHAVE_WIN32'
endif
@@ -25,15 +21,18 @@ tests = [
[ 'testboundaries_ucd' ],
[ 'testcolor' ],
[ 'testscript' ],
+ [ 'cxx-test', [ 'cxx-test.cpp' ] ],
]
if freetype_dep.found()
+ test_cflags += '-DHAVE_FREETYPE'
tests += [
[ 'test-ot-tags', [ 'test-ot-tags.c' ], [ libpangoft2_dep ] ],
]
endif
if cairo_dep.found()
+ test_cflags += '-DHAVE_CAIRO'
tests += [
[ 'testiter', [ 'testiter.c' ], [ libpangocairo_dep ] ],
[ 'test-pangocairo-threads', [ 'test-pangocairo-threads.c' ], [ libpangocairo_dep, cairo_dep ] ],
@@ -52,6 +51,7 @@ foreach t: tests
bin = executable(name, src,
dependencies: deps,
include_directories: root_inc,
- c_args: common_cflags + pango_debug_cflags)
+ c_args: common_cflags + pango_debug_cflags + test_cflags,
+ cpp_args: common_cppflags + pango_debug_cflags + test_cflags)
test(name, bin, env: test_env)
endforeach