diff options
| author | Nirbheek Chauhan <nirbheek.chauhan@gmail.com> | 2019-04-07 07:55:36 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-04-07 07:55:36 +0000 |
| commit | ef87d11dcdcd2685e6dd5fa994e155a0801a630b (patch) | |
| tree | 4bd887dd6c6b837036dda6ab90c5ebf623d3fa41 /mesonbuild/optinterpreter.py | |
| parent | a2c3ba474a5ad47539b5ecf7218db272fab8359f (diff) | |
| parent | 91b2475e30d7659dad24eb35b47e4d098c716792 (diff) | |
| download | meson-ef87d11dcdcd2685e6dd5fa994e155a0801a630b.zip meson-ef87d11dcdcd2685e6dd5fa994e155a0801a630b.tar.gz meson-ef87d11dcdcd2685e6dd5fa994e155a0801a630b.tar.bz2 | |
Merge pull request #4931 from dcbaker/pkg-config-builtin
dependencies: Add command line option for pkg_config_path
Diffstat (limited to 'mesonbuild/optinterpreter.py')
| -rw-r--r-- | mesonbuild/optinterpreter.py | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/mesonbuild/optinterpreter.py b/mesonbuild/optinterpreter.py index 85f6897..e64ed4e 100644 --- a/mesonbuild/optinterpreter.py +++ b/mesonbuild/optinterpreter.py @@ -20,19 +20,20 @@ from . import coredata from . import mesonlib from . import compilers -forbidden_option_names = coredata.get_builtin_options() +forbidden_option_names = set(coredata.builtin_options.keys()) forbidden_prefixes = [lang + '_' for lang in compilers.all_languages] + ['b_', 'backend_'] reserved_prefixes = ['cross_'] -def is_invalid_name(name): +def is_invalid_name(name: str, *, log: bool = True) -> bool: if name in forbidden_option_names: return True pref = name.split('_')[0] + '_' if pref in forbidden_prefixes: return True if pref in reserved_prefixes: - from . import mlog - mlog.deprecation('Option uses prefix "%s", which is reserved for Meson. This will become an error in the future.' % pref) + if log: + from . import mlog + mlog.deprecation('Option uses prefix "%s", which is reserved for Meson. This will become an error in the future.' % pref) return False class OptionException(mesonlib.MesonException): |