luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-08-08 18:24:04 +02:00
Code Issues Packages Projects Releases Wiki Activity

build: Refactor resources test build instructions

Browse Source 
This introduces no functional changes, but combines two duplicated lists
and makes the meson.build file a little easier to follow.

Signed-off-by: Philip Withnall <withnall@endlessm.com>

Helps: #1711
This commit is contained in:
Philip Withnall
2019-04-03 16:45:58 +01:00
parent a06d7cc7b8
commit ea8e6502d4
1 changed files with 19 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
gio/tests/meson.build
View File

@@ -557,6 +557,15 @@ if not meson.is_cross_build() or meson.has_exe_wrapper()
copy : true, copy : true,
install : false) install : false)
resources_extra_sources = [
test_gresource,
test_resources_c,
test_resources2_c,
test_resources2_h,
digit_test_resources_c,
digit_test_resources_h,
]
# Create object file containing resource data # Create object file containing resource data
# for testing the external data option # for testing the external data option
if build_machine.system() == 'linux' if build_machine.system() == 'linux'
@@ -603,21 +612,17 @@ if not meson.is_cross_build() or meson.has_exe_wrapper()
'@INPUT@', '@INPUT@',
'@OUTPUT@']) '@OUTPUT@'])
gio_tests += { resources_extra_sources += [
'resources' : { test_resources_binary_c,
'extra_sources' : [test_gresource, test_resources_c, test_resources2_c, test_resources_binary2,
test_resources2_h, test_resources_binary_c, ]
test_resources_binary2, digit_test_resources_c, digit_test_resources_h],
},
}
else
gio_tests += {
'resources' : {
'extra_sources' : [test_gresource, test_resources_c, test_resources2_c,
test_resources2_h, digit_test_resources_c, digit_test_resources_h],
},
}
endif endif
gio_tests += {
'resources' : {
'extra_sources' : resources_extra_sources,
},
}
endif endif
foreach test_name, extra_args : gio_tests foreach test_name, extra_args : gio_tests