diff options
| author | Elliott Sales de Andrade <quantum.analyst@gmail.com> | 2016-11-13 19:00:20 -0500 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2016-11-18 15:30:56 -0500 |
| commit | 996f4d89f3d60731306a6a72b339eb5c2dbb5020 (patch) | |
| tree | fcad79bdaa42a32e54abe743755d474f86fa3a53 | |
| parent | 621219ccb0b0130f2146e32ccdc22db803b2bb09 (diff) | |
| download | meson-996f4d89f3d60731306a6a72b339eb5c2dbb5020.zip meson-996f4d89f3d60731306a6a72b339eb5c2dbb5020.tar.gz meson-996f4d89f3d60731306a6a72b339eb5c2dbb5020.tar.bz2 | |
Disallow some keyword arguments to gnome.mkenums.
The install argument is allowed for CustomTargets, but we use
install_header as the setting now. Also, setting a generic template when
specifying the more specific source or header template shouldn't be
allowed.
| -rw-r--r-- | mesonbuild/modules/gnome.py | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/mesonbuild/modules/gnome.py b/mesonbuild/modules/gnome.py index 777fda8..e15147a 100644 --- a/mesonbuild/modules/gnome.py +++ b/mesonbuild/modules/gnome.py @@ -715,7 +715,7 @@ can not be used with the current version of glib-compiled-resources, due to known_kwargs = ['comments', 'eprod', 'fhead', 'fprod', 'ftail', 'identifier_prefix', 'symbol_prefix', 'template', 'vhead', 'vprod', 'vtail'] - known_custom_target_kwargs = ['install', 'install_dir', 'build_always', + known_custom_target_kwargs = ['install_dir', 'build_always', 'depends', 'depend_files'] c_template = h_template = None install_header = False @@ -724,8 +724,16 @@ can not be used with the current version of glib-compiled-resources, due to sources = [value] + sources elif arg == 'c_template': c_template = value + if 'template' in kwargs: + raise MesonException('Mkenums does not accept both ' + 'c_template and template keyword ' + 'arguments at the same time.') elif arg == 'h_template': h_template = value + if 'template' in kwargs: + raise MesonException('Mkenums does not accept both ' + 'h_template and template keyword ' + 'arguments at the same time.') elif arg == 'install_header': install_header = value elif arg in known_kwargs: |