diff options
| author | Uli Schlachter <psychon@znc.in> | 2021-05-22 07:59:52 +0200 |
|---|---|---|
| committer | Uli Schlachter <psychon@znc.in> | 2021-05-22 07:59:52 +0200 |
| commit | 1981fb6dfb51f44feb68590f51309520185e0780 (patch) | |
| tree | 749946a25b2cd2ce77e2d68e6b21e03ef8924ddc /test/meson.build | |
| parent | 63f0d6268469dcd12316ea405a026f4be900dd79 (diff) | |
| download | cairo-1981fb6dfb51f44feb68590f51309520185e0780.tar.gz | |
meson: Use more dependency objects
For example, to depend on cairo-script, inccairoscript was added to
"include_directories:" and libcairoscript was added to "link_with:".
This commit instead uses the libcairoscript_dep dependency everywhere.
Signed-off-by: Uli Schlachter <psychon@znc.in>
Diffstat (limited to 'test/meson.build')
| -rw-r--r-- | test/meson.build | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/test/meson.build b/test/meson.build index 70082f94a..3039cf6da 100644 --- a/test/meson.build +++ b/test/meson.build @@ -572,8 +572,6 @@ cairo_test_constructors = custom_target('cairo-test-constructors.c', output: 'cairo-test-constructors.c', command: [python3, files('make-cairo-test-constructors.py')[0], '@OUTPUT@', '@INPUT@']) -incpdiff = include_directories('pdiff') - test_depends = [] subdir('pdiff') @@ -598,27 +596,25 @@ endif if build_any2ppm any2ppm_exe = executable('any2ppm', 'any2ppm.c', - include_directories: [incbase, incsrc, inccairoscript], - link_with: [libcairo, libcairoscript], - dependencies: deps + test_deps, + include_directories: [incbase], + dependencies: deps + test_deps + [libcairo_dep, libcairoscript_dep], ) test_depends += [any2ppm_exe] endif if have_shm cairo_test_trace_exe = executable('cairo-test-trace', cairo_test_trace_sources, - include_directories: [incbase, incsrc, incboilerplate, incpdiff, inccairoscript, inccairomissing], + include_directories: [incbase], c_args: pthread_c_args, - link_with: [libcairo, libcairoboilerplate, libpdiff, libcairoscript, libcairomissing], link_args: extra_link_args, - dependencies: deps + test_deps + [rt_dep]) + dependencies: deps + test_deps + [rt_dep, libcairo_dep, cairoboilerplate_dep, libpdiff_dep, libcairomissing_dep, libcairoscript_dep]) endif exe = executable('cairo-test-suite', [cairo_test_suite_sources, test_sources, cairo_test_constructors], - include_directories: [incbase, incsrc, incboilerplate, incpdiff], - link_with: [libcairo, libcairoboilerplate, libpdiff], + include_directories: [incbase], link_args: extra_link_args, - dependencies: deps + test_deps, + dependencies: deps + test_deps + [libcairo_dep, cairoboilerplate_dep, + libpdiff_dep], ) env = environment() |