luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-10-02 19:59:21 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'wip/smcv/subprojects' into 'main'

Browse Source 
Improve test behaviour when using Meson subprojects

Closes #3625 and #3626

See merge request GNOME/glib!4534
This commit is contained in:
Philip Withnall
2025-02-28 12:46:31 +00:00
parent 69462f4921 66bca5f78b
commit 0b62f3dd82
2 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
meson.build
View File

@@ -2225,9 +2225,13 @@ else
endif endif
pcre2_req = '>=10.32' pcre2_req = '>=10.32'
pcre2_options = [
'default_library=static',
'test=false',
]
# Pick up pcre from the system, or if "--force-fallback-for libpcre2-8" was specified # Pick up pcre from the system, or if "--force-fallback-for libpcre2-8" was specified
pcre2 = dependency('libpcre2-8', version: pcre2_req, required: false, default_options: ['default_library=static']) pcre2 = dependency('libpcre2-8', version: pcre2_req, required: false, default_options: pcre2_options)
if not pcre2.found() if not pcre2.found()
if cc.get_id() == 'msvc' or cc.get_id() == 'clang-cl' if cc.get_id() == 'msvc' or cc.get_id() == 'clang-cl'
# MSVC: Search for the PCRE2 library by the configuration, which corresponds # MSVC: Search for the PCRE2 library by the configuration, which corresponds
@@ -2243,7 +2247,7 @@ endif
# Try again with the fallback # Try again with the fallback
if not pcre2.found() if not pcre2.found()
pcre2 = dependency('libpcre2-8', version: pcre2_req, allow_fallback: true, default_options: ['default_library=static']) pcre2 = dependency('libpcre2-8', version: pcre2_req, allow_fallback: true, default_options: pcre2_options)
assert(pcre2.type_name() == 'internal') assert(pcre2.type_name() == 'internal')
# static flags are automatically enabled by the subproject if it's built # static flags are automatically enabled by the subproject if it's built
# with default_library=static # with default_library=static

6
tests/meson.build
View File

@@ -25,13 +25,15 @@ if have_bash
endforeach endforeach
endif endif
test( if not meson.is_subproject()
test(
'check-missing-install-tag.py', 'check-missing-install-tag.py',
python, python,
args : ['-B', files('check-missing-install-tag.py')], args : ['-B', files('check-missing-install-tag.py')],
env : test_env, env : test_env,
suite : ['lint', 'no-valgrind'], suite : ['lint', 'no-valgrind'],
protocol : 'tap', protocol : 'tap',
) )
endif
subdir('lib') subdir('lib')