Skip to content
Snippets Groups Projects
Commit d6530420 authored by Simon McVittie's avatar Simon McVittie
Browse files

pressure-vessel: Correctly track dependencies on generated headers

parent a93f9e7e
No related branches found
No related tags found
No related merge requests found
...@@ -105,6 +105,10 @@ pressure_vessel_utils = static_library( ...@@ -105,6 +105,10 @@ pressure_vessel_utils = static_library(
include_directories : pv_include_dirs, include_directories : pv_include_dirs,
install: false, install: false,
) )
pressure_vessel_utils_dep = declare_dependency(
link_with : pressure_vessel_utils,
sources : launcher1[1],
)
launcher_codegen = static_library( launcher_codegen = static_library(
'pressure-vessel-launcher-codegen', 'pressure-vessel-launcher-codegen',
...@@ -116,6 +120,10 @@ launcher_codegen = static_library( ...@@ -116,6 +120,10 @@ launcher_codegen = static_library(
include_directories : pv_include_dirs, include_directories : pv_include_dirs,
install: false, install: false,
) )
launcher_codegen_dep = declare_dependency(
link_with : launcher_codegen,
sources : launcher1[1],
)
executable( executable(
'pressure-vessel-adverb', 'pressure-vessel-adverb',
...@@ -126,13 +134,11 @@ executable( ...@@ -126,13 +134,11 @@ executable(
], ],
c_args : pv_c_args, c_args : pv_c_args,
dependencies : [ dependencies : [
pressure_vessel_utils_dep,
threads, threads,
gio_unix, gio_unix,
libglnx.get_variable('libglnx_dep'), libglnx.get_variable('libglnx_dep'),
], ],
link_with : [
pressure_vessel_utils,
],
include_directories : pv_include_dirs, include_directories : pv_include_dirs,
install : true, install : true,
install_dir : pv_bindir, install_dir : pv_bindir,
...@@ -147,13 +153,11 @@ executable( ...@@ -147,13 +153,11 @@ executable(
], ],
c_args : pv_c_args, c_args : pv_c_args,
dependencies : [ dependencies : [
pressure_vessel_utils_dep,
threads, threads,
gio_unix, gio_unix,
libglnx.get_variable('libglnx_dep'), libglnx.get_variable('libglnx_dep'),
], ],
link_with : [
pressure_vessel_utils,
],
include_directories : pv_include_dirs, include_directories : pv_include_dirs,
install : true, install : true,
install_dir : pv_bindir, install_dir : pv_bindir,
...@@ -168,14 +172,12 @@ executable( ...@@ -168,14 +172,12 @@ executable(
], ],
c_args : pv_c_args, c_args : pv_c_args,
dependencies : [ dependencies : [
launcher_codegen_dep,
pressure_vessel_utils_dep,
threads, threads,
gio_unix, gio_unix,
libglnx.get_variable('libglnx_dep'), libglnx.get_variable('libglnx_dep'),
], ],
link_with : [
launcher_codegen,
pressure_vessel_utils,
],
include_directories : pv_include_dirs, include_directories : pv_include_dirs,
install : true, install : true,
install_dir : pv_bindir, install_dir : pv_bindir,
...@@ -201,14 +203,12 @@ executable( ...@@ -201,14 +203,12 @@ executable(
] + enums, ] + enums,
c_args : pv_c_args, c_args : pv_c_args,
dependencies : [ dependencies : [
pressure_vessel_utils_dep,
libsteamrt_static_dep, libsteamrt_static_dep,
gio_unix, gio_unix,
xau, xau,
libglnx.get_variable('libglnx_dep'), libglnx.get_variable('libglnx_dep'),
], ],
link_with : [
pressure_vessel_utils,
],
include_directories : pv_include_dirs, include_directories : pv_include_dirs,
install : true, install : true,
install_dir : pv_bindir, install_dir : pv_bindir,
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment