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

Merge branch 'optional_tests' into 'master'

Browse Source 
Only build tests if certain conditions are met.

See merge request GNOME/glib!774
This commit is contained in:
Philip Withnall 2019-04-16 10:19:41 +00:00
commit e6f1b364cc
4 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gio/meson.build
View File

@ -994,4 +994,8 @@ if enable_systemtap
endif endif
subdir('fam') subdir('fam')
subdir('tests') # Don’t build the tests unless we can run them (either natively or in an exe wrapper)
build_tests = not meson.is_cross_build() or (meson.is_cross_build() and meson.has_exe_wrapper())
if build_tests
subdir('tests')
endif

6
glib/meson.build
View File

@ -459,4 +459,8 @@ if enable_systemtap
install : true) install : true)
endif endif
subdir('tests') # Don’t build the tests unless we can run them (either natively or in an exe wrapper)
build_tests = not meson.is_cross_build() or (meson.is_cross_build() and meson.has_exe_wrapper())
if build_tests
subdir('tests')
endif

6
gobject/meson.build
View File

@ -166,4 +166,8 @@ if enable_systemtap
install : true) install : true)
endif endif
subdir('tests') # Don’t build the tests unless we can run them (either natively or in an exe wrapper)
build_tests = not meson.is_cross_build() or (meson.is_cross_build() and meson.has_exe_wrapper())
if build_tests
subdir('tests')
endif

6
meson.build
View File

@ -2045,7 +2045,11 @@ subdir('gthread')
subdir('gmodule') subdir('gmodule')
subdir('gio') subdir('gio')
subdir('fuzzing') subdir('fuzzing')
subdir('tests') # Don’t build the tests unless we can run them (either natively or in an exe wrapper)
build_tests = not meson.is_cross_build() or (meson.is_cross_build() and meson.has_exe_wrapper())
if build_tests
subdir('tests')
endif
# xgettext is optional (on Windows for instance) # xgettext is optional (on Windows for instance)
if find_program('xgettext', required : get_option('nls')).found() if find_program('xgettext', required : get_option('nls')).found()