diff options
| author | Ting-Wei Lan <lantw@src.gnome.org> | 2019-07-24 14:58:39 +0800 |
|---|---|---|
| committer | Robert Ancell <robert.ancell@gmail.com> | 2019-08-25 09:42:22 +0000 |
| commit | 299647f970a5123e9f462327214c11ec758822d6 (patch) | |
| tree | c06831f57994583b4e48a9c5c6f6600c40de58f4 /tests | |
| parent | 6d16bf733739c6fd4e9ea99c6d8201fa3a214b04 (diff) | |
| download | gnome-control-center-299647f970a5123e9f462327214c11ec758822d6.tar.gz | |
build: Include generated sources in declared dependencies
Sometimes ninja decides to compile tests/interactive-panels/main.c,
which requires shell/resources.h, before shell/resources.h is generated.
The fix is to use 'sources' argument of declare_dependency to properly
declare the dependency on generated headers.
A fix for tests/datetime and panels/datetime is also included in the
commit to fix a similar problem.
Closes https://gitlab.gnome.org/GNOME/gnome-control-center/merge_requests/472
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/datetime/meson.build | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/tests/datetime/meson.build b/tests/datetime/meson.build index 3e7a37851..c9f07877c 100644 --- a/tests/datetime/meson.build +++ b/tests/datetime/meson.build @@ -5,7 +5,6 @@ test_units = [ 'test-endianess', ] -includes = [top_inc, include_directories('../../panels/datetime')] env = [ 'G_MESSAGES_DEBUG=all', 'BUILDDIR=' + meson.current_build_dir(), @@ -22,9 +21,7 @@ foreach unit: test_units exe = executable( unit, [unit + '.c'], - include_directories : includes, - dependencies : common_deps + [m_dep], - link_with : [datetime_panel_lib], + dependencies : common_deps + [m_dep, datetime_panel_lib_dep], c_args : cflags ) endforeach |