diff options
| author | Raphael Salamon <killekulla@rdrz.de> | 2018-01-16 01:37:40 +0100 |
|---|---|---|
| committer | Nirbheek Chauhan <nirbheek@centricular.com> | 2018-02-19 01:32:16 +0530 |
| commit | 8cff84a26a03993d35ea55a8f41143b5c00eebd0 (patch) | |
| tree | 3e3cf350d4752b3e63f4ea233f5dce4a58848928 | |
| parent | dc6ffe7fd7d70bdba2b203d96a8e29d478defea3 (diff) | |
| download | meson-8cff84a26a03993d35ea55a8f41143b5c00eebd0.zip meson-8cff84a26a03993d35ea55a8f41143b5c00eebd0.tar.gz meson-8cff84a26a03993d35ea55a8f41143b5c00eebd0.tar.bz2 | |
Add `main` argument to `dependency` (#2828)
`GTest` uses this keyword for conditional linking of it's main().
Fixes issue #2828
| -rw-r--r-- | mesonbuild/interpreter.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mesonbuild/interpreter.py b/mesonbuild/interpreter.py index b848a69..9a018bb 100644 --- a/mesonbuild/interpreter.py +++ b/mesonbuild/interpreter.py @@ -1368,7 +1368,7 @@ permitted_kwargs = {'add_global_arguments': {'language'}, 'build_target': build_target_kwargs, 'configure_file': {'input', 'output', 'configuration', 'command', 'install_dir', 'capture', 'install'}, 'custom_target': {'input', 'output', 'command', 'install', 'install_dir', 'build_always', 'capture', 'depends', 'depend_files', 'depfile', 'build_by_default'}, - 'dependency': {'default_options', 'fallback', 'language', 'method', 'modules', 'optional_modules', 'native', 'required', 'static', 'version'}, + 'dependency': {'default_options', 'fallback', 'language', 'main', 'method', 'modules', 'optional_modules', 'native', 'required', 'static', 'version'}, 'declare_dependency': {'include_directories', 'link_with', 'sources', 'dependencies', 'compile_args', 'link_args', 'version'}, 'executable': exe_kwargs, 'find_program': {'required', 'native'}, |