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

build: Only instantiate libglnx subproject once

parent d3530450
No related branches found
No related tags found
No related merge requests found
...@@ -127,6 +127,8 @@ endforeach ...@@ -127,6 +127,8 @@ endforeach
supported_warning_cflags = c_compiler.get_supported_arguments(project_warning_cflags) supported_warning_cflags = c_compiler.get_supported_arguments(project_warning_cflags)
add_project_arguments(supported_warning_cflags, language : 'c') add_project_arguments(supported_warning_cflags, language : 'c')
libglnx = subproject('libglnx')
scripts = [ scripts = [
'pressure-vessel-locale-gen', 'pressure-vessel-locale-gen',
'pressure-vessel-test-ui', 'pressure-vessel-test-ui',
...@@ -217,7 +219,7 @@ executable( ...@@ -217,7 +219,7 @@ executable(
], ],
dependencies : [ dependencies : [
dependency('gio-unix-2.0', required : true), dependency('gio-unix-2.0', required : true),
subproject('libglnx').get_variable('libglnx_dep'), libglnx.get_variable('libglnx_dep'),
], ],
include_directories : project_include_dirs, include_directories : project_include_dirs,
install : true, install : true,
...@@ -264,7 +266,7 @@ executable( ...@@ -264,7 +266,7 @@ executable(
), ),
dependency('gio-unix-2.0', required : true), dependency('gio-unix-2.0', required : true),
dependency('xau', required : true), dependency('xau', required : true),
subproject('libglnx').get_variable('libglnx_dep'), libglnx.get_variable('libglnx_dep'),
], ],
include_directories : project_include_dirs, include_directories : project_include_dirs,
install : true, install : true,
...@@ -299,7 +301,7 @@ executable( ...@@ -299,7 +301,7 @@ executable(
], ],
dependencies : [ dependencies : [
dependency('gio-unix-2.0', required : true), dependency('gio-unix-2.0', required : true),
subproject('libglnx').get_variable('libglnx_dep'), libglnx.get_variable('libglnx_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