diff options
| author | Xavier Claessens <xavier.claessens@collabora.com> | 2020-03-18 09:48:00 -0400 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2020-03-24 22:48:55 +0200 |
| commit | 4d7ccd13990feed8fa5c8a9c3fa9bdf5949e3a04 (patch) | |
| tree | b5a08a1666a78927996afc1226a57f241248593e /mesonbuild | |
| parent | b3fe9fa5d86bf48649adf72333531f6e164ab381 (diff) | |
| download | meson-4d7ccd13990feed8fa5c8a9c3fa9bdf5949e3a04.zip meson-4d7ccd13990feed8fa5c8a9c3fa9bdf5949e3a04.tar.gz meson-4d7ccd13990feed8fa5c8a9c3fa9bdf5949e3a04.tar.bz2 | |
Make werror per subproject option
Diffstat (limited to 'mesonbuild')
| -rw-r--r-- | mesonbuild/backend/backends.py | 2 | ||||
| -rw-r--r-- | mesonbuild/coredata.py | 2 | ||||
| -rw-r--r-- | mesonbuild/modules/hotdoc.py | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/mesonbuild/backend/backends.py b/mesonbuild/backend/backends.py index ab922ba..687b122 100644 --- a/mesonbuild/backend/backends.py +++ b/mesonbuild/backend/backends.py @@ -179,7 +179,7 @@ class Backend: if option_name in target.option_overrides: override = target.option_overrides[option_name] return self.environment.coredata.validate_option_value(option_name, override) - return self.environment.coredata.get_builtin_option(option_name) + return self.environment.coredata.get_builtin_option(option_name, target.subproject) def get_target_filename_for_linking(self, target): # On some platforms (msvc for instance), the file that is used for diff --git a/mesonbuild/coredata.py b/mesonbuild/coredata.py index 7038bf7..074f9e6 100644 --- a/mesonbuild/coredata.py +++ b/mesonbuild/coredata.py @@ -1104,7 +1104,7 @@ builtin_options = OrderedDict([ ('unity', BuiltinOption(UserComboOption, 'Unity build', 'off', choices=['on', 'off', 'subprojects'])), ('unity_size', BuiltinOption(UserIntegerOption, 'Unity block size', (2, None, 4))), ('warning_level', BuiltinOption(UserComboOption, 'Compiler warning level to use', '1', choices=['0', '1', '2', '3'])), - ('werror', BuiltinOption(UserBooleanOption, 'Treat warnings as errors', False)), + ('werror', BuiltinOption(UserBooleanOption, 'Treat warnings as errors', False, yielding=False)), ('wrap_mode', BuiltinOption(UserComboOption, 'Wrap mode', 'default', choices=['default', 'nofallback', 'nodownload', 'forcefallback'])), ]) diff --git a/mesonbuild/modules/hotdoc.py b/mesonbuild/modules/hotdoc.py index bf4386f..5c04e27 100644 --- a/mesonbuild/modules/hotdoc.py +++ b/mesonbuild/modules/hotdoc.py @@ -326,7 +326,7 @@ class HotdocTargetBuilder: for path in self.include_paths.keys(): self.cmd.extend(['--include-path', path]) - if self.state.environment.coredata.get_builtin_option('werror'): + if self.state.environment.coredata.get_builtin_option('werror', self.state.subproject): self.cmd.append('--fatal-warning') self.generate_hotdoc_config() |