diff options
| author | afdw <afdw@yandex.ru> | 2021-05-29 16:21:31 +0000 |
|---|---|---|
| committer | Anton Danilkin <afdw@yandex.ru> | 2021-05-29 18:32:53 +0200 |
| commit | 9ab52c9131767486700e286a7732dab1ed2e48d5 (patch) | |
| tree | f4da6e50abcd6596b91b414484483b20d37f3e12 /test/meson.build | |
| parent | ec2cf9ac35c24495c60fff4e2fd8668bcc9ed612 (diff) | |
| parent | 63f0d6268469dcd12316ea405a026f4be900dd79 (diff) | |
| download | cairo-9ab52c9131767486700e286a7732dab1ed2e48d5.tar.gz | |
Merge branch 'master' into 'svg-backend-work'
# Conflicts:
# .gitlab-ci.yml
# test/Makefile.sources
# test/meson.build
Diffstat (limited to 'test/meson.build')
| -rw-r--r-- | test/meson.build | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/test/meson.build b/test/meson.build index b4562adb8..143d2f09c 100644 --- a/test/meson.build +++ b/test/meson.build @@ -283,6 +283,7 @@ test_sources = [ 'record-mesh.c', 'record-replay-extend.c', 'record-transform-paint.c', + 'record-write-png.c', 'recording-ink-extents.c', 'recording-surface-pattern.c', 'recording-surface-extend.c', @@ -602,7 +603,6 @@ endif if build_any2ppm any2ppm_exe = executable('any2ppm', 'any2ppm.c', - c_args: ['-DHAVE_CONFIG_H'], include_directories: [incbase, incsrc, inccairoscript], link_with: [libcairo, libcairoscript], dependencies: deps + test_deps, @@ -613,7 +613,7 @@ endif if have_shm cairo_test_trace_exe = executable('cairo-test-trace', cairo_test_trace_sources, include_directories: [incbase, incsrc, incboilerplate, incpdiff, inccairoscript, inccairomissing], - c_args: ['-DHAVE_CONFIG_H'] + pthread_c_args, + c_args: pthread_c_args, link_with: [libcairo, libcairoboilerplate, libpdiff, libcairoscript, libcairomissing], link_args: extra_link_args, dependencies: deps + test_deps + [rt_dep]) @@ -621,7 +621,6 @@ endif exe = executable('cairo-test-suite', [cairo_test_suite_sources, test_sources, cairo_test_constructors], include_directories: [incbase, incsrc, incboilerplate, incpdiff], - c_args: ['-DHAVE_CONFIG_H'], link_with: [libcairo, libcairoboilerplate, libpdiff], link_args: extra_link_args, dependencies: deps + test_deps, |