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

Merge branch 'wip/smcv/enums-h' into 'master'

build: Generate a dependency for libs-r-t's generated headers

See merge request !163
parents 763c5a60 46a11a07
No related branches found
No related tags found
1 merge request!163build: Generate a dependency for libs-r-t's generated headers
Pipeline #5081 passed
...@@ -82,6 +82,10 @@ install_headers( ...@@ -82,6 +82,10 @@ install_headers(
subdir : join_paths('steam-runtime-tools-' + api_major, 'steam-runtime-tools'), subdir : join_paths('steam-runtime-tools-' + api_major, 'steam-runtime-tools'),
) )
libsteamrt_generated_headers_dep = declare_dependency(
include_directories : project_include_dirs,
sources : [enums[1]],
)
libsteamrt_static = static_library( libsteamrt_static = static_library(
'steam-runtime-tools-internal', 'steam-runtime-tools-internal',
libsteamrt_sources + libsteamrt_public_headers + enums, libsteamrt_sources + libsteamrt_public_headers + enums,
...@@ -101,6 +105,7 @@ libsteamrt_static = static_library( ...@@ -101,6 +105,7 @@ libsteamrt_static = static_library(
gobject, gobject,
libglnx_dep, libglnx_dep,
json_glib, json_glib,
libsteamrt_generated_headers_dep,
], ],
install : false, install : false,
) )
...@@ -115,6 +120,7 @@ libsteamrt = library( ...@@ -115,6 +120,7 @@ libsteamrt = library(
gobject, gobject,
libglnx_dep, libglnx_dep,
json_glib, json_glib,
libsteamrt_generated_headers_dep,
], ],
objects : [libsteamrt_static.extract_all_objects()], objects : [libsteamrt_static.extract_all_objects()],
soversion : abi_major, soversion : abi_major,
...@@ -130,14 +136,14 @@ pkg.generate( ...@@ -130,14 +136,14 @@ pkg.generate(
version : meson.project_version(), version : meson.project_version(),
) )
libsteamrt_dep = declare_dependency( libsteamrt_dep = declare_dependency(
dependencies : libsteamrt_generated_headers_dep,
include_directories : project_include_dirs, include_directories : project_include_dirs,
link_with : libsteamrt, link_with : libsteamrt,
sources : libsteamrt_public_headers + [enums[1]],
) )
libsteamrt_static_dep = declare_dependency( libsteamrt_static_dep = declare_dependency(
dependencies : libsteamrt_generated_headers_dep,
include_directories : project_include_dirs, include_directories : project_include_dirs,
link_with : libsteamrt_static, link_with : libsteamrt_static,
sources : libsteamrt_public_headers + [enums[1]],
) )
if get_option('introspection') if get_option('introspection')
......
...@@ -57,6 +57,7 @@ test_utils = static_library( ...@@ -57,6 +57,7 @@ test_utils = static_library(
gio_unix, gio_unix,
json_glib, json_glib,
libglnx_dep, libglnx_dep,
libsteamrt_generated_headers_dep,
], ],
include_directories : project_include_dirs, include_directories : project_include_dirs,
install: false, install: false,
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment