diff --git a/meson.build b/meson.build index 29df15217..5de87d235 100644 --- a/meson.build +++ b/meson.build @@ -2225,9 +2225,13 @@ else endif 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 -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 cc.get_id() == 'msvc' or cc.get_id() == 'clang-cl' # MSVC: Search for the PCRE2 library by the configuration, which corresponds @@ -2243,7 +2247,7 @@ endif # Try again with the fallback 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') # static flags are automatically enabled by the subproject if it's built # with default_library=static diff --git a/tests/meson.build b/tests/meson.build index 42162f4c3..2ea32e8a0 100644 --- a/tests/meson.build +++ b/tests/meson.build @@ -25,13 +25,15 @@ if have_bash endforeach endif -test( - 'check-missing-install-tag.py', - python, - args : ['-B', files('check-missing-install-tag.py')], - env : test_env, - suite : ['lint', 'no-valgrind'], - protocol : 'tap', -) +if not meson.is_subproject() + test( + 'check-missing-install-tag.py', + python, + args : ['-B', files('check-missing-install-tag.py')], + env : test_env, + suite : ['lint', 'no-valgrind'], + protocol : 'tap', + ) +endif subdir('lib')