diff options
author | Dylan Baker <dylan@pnwbakers.com> | 2022-05-26 13:15:13 -0700 |
---|---|---|
committer | Eli Schwartz <eschwartz93@gmail.com> | 2022-06-01 22:49:10 -0400 |
commit | 618b187f70f9267eaf5112373aa9925b38f44da0 (patch) | |
tree | b459b5015e7f9f3fe4ff499fb9bd9b530aa50700 /mesonbuild/modules/cmake.py | |
parent | 50e9769403a8e3f7c281aff1ff8f9cad7bfe2276 (diff) | |
download | meson-618b187f70f9267eaf5112373aa9925b38f44da0.zip meson-618b187f70f9267eaf5112373aa9925b38f44da0.tar.gz meson-618b187f70f9267eaf5112373aa9925b38f44da0.tar.bz2 |
interpreter: use a shared KwargInfo for install_dir
CustomTarget allows multiple install dirs, while basically everything
else allows only one. So this provides a shared instance for that.
Diffstat (limited to 'mesonbuild/modules/cmake.py')
-rw-r--r-- | mesonbuild/modules/cmake.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mesonbuild/modules/cmake.py b/mesonbuild/modules/cmake.py index a219268..1950254 100644 --- a/mesonbuild/modules/cmake.py +++ b/mesonbuild/modules/cmake.py @@ -23,7 +23,7 @@ from . import ExtensionModule, ModuleReturnValue, ModuleObject from .. import build, mesonlib, mlog, dependencies from ..cmake import TargetOptions, cmake_defines_to_args from ..interpreter import SubprojectHolder -from ..interpreter.type_checking import REQUIRED_KW, NoneType, in_set_validator +from ..interpreter.type_checking import REQUIRED_KW, INSTALL_DIR_KW, NoneType, in_set_validator from ..interpreterbase import ( FeatureNew, FeatureNewKwargs, @@ -296,9 +296,9 @@ class CmakeModule(ExtensionModule): 'cmake.write_basic_package_version_file', KwargInfo('arch_independent', bool, default=False, since='0.62.0'), KwargInfo('compatibility', str, default='AnyNewerVersion', validator=in_set_validator(set(COMPATIBILITIES))), - KwargInfo('install_dir', (str, NoneType), default=None), KwargInfo('name', str, required=True), KwargInfo('version', str, required=True), + INSTALL_DIR_KW, ) def write_basic_package_version_file(self, state, args, kwargs: 'WriteBasicPackageVersionFile'): arch_independent = kwargs['arch_independent'] @@ -365,8 +365,8 @@ class CmakeModule(ExtensionModule): (str, mesonlib.File, ContainerTypeInfo(list, mesonlib.File)), required=True, validator=lambda x: 'requires exactly one file' if isinstance(x, list) and len(x) != 1 else None, convertor=lambda x: x[0] if isinstance(x, list) else x), - KwargInfo('install_dir', (str, NoneType), default=None), KwargInfo('name', str, required=True), + INSTALL_DIR_KW, ) def configure_package_config_file(self, state, args, kwargs: 'ConfigurePackageConfigFile'): inputfile = kwargs['input'] |