summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDylan Baker <dylan@pnwbakers.com>2025-09-23 09:37:41 -0700
committerDylan Baker <dylan@pnwbakers.com>2025-10-15 10:21:46 -0700
commit5d05b1e2695d9f87e4f2d5f22c25a7b28e9f5657 (patch)
treed7633f36cae4636583bcc18dfd99db67e3b584af
parent6d715a59ae780f55a7a303a8480dfe33d806ae26 (diff)
downloadmeson-5d05b1e2695d9f87e4f2d5f22c25a7b28e9f5657.tar.gz
build: collapse Target.process_kwargs_base into BuildTarget.process_kwargs
This is the only caller, so there's no reason to not do this.
-rw-r--r--mesonbuild/build.py26
1 files changed, 12 insertions, 14 deletions
diff --git a/mesonbuild/build.py b/mesonbuild/build.py
index f3b25a182..643149c44 100644
--- a/mesonbuild/build.py
+++ b/mesonbuild/build.py
@@ -662,19 +662,6 @@ class Target(HoldableObject, metaclass=abc.ABCMeta):
def get_id(self) -> str:
return self.id
- def process_kwargs_base(self, kwargs: T.Dict[str, T.Any]) -> None:
- if 'build_by_default' in kwargs:
- self.build_by_default = kwargs['build_by_default']
- if not isinstance(self.build_by_default, bool):
- raise InvalidArguments('build_by_default must be a boolean value.')
-
- if not self.build_by_default and kwargs.get('install', False):
- # For backward compatibility, if build_by_default is not explicitly
- # set, use the value of 'install' if it's enabled.
- self.build_by_default = True
-
- self.raw_overrides = kwargs.get('override_options', {})
-
def get_override(self, name: str) -> T.Optional[str]:
return self.raw_overrides.get(name, None)
@@ -1173,9 +1160,20 @@ class BuildTarget(Target):
return self.install_mode
def process_kwargs(self, kwargs):
- self.process_kwargs_base(kwargs)
self.original_kwargs = kwargs
+ if 'build_by_default' in kwargs:
+ self.build_by_default = kwargs['build_by_default']
+ if not isinstance(self.build_by_default, bool):
+ raise InvalidArguments('build_by_default must be a boolean value.')
+
+ if not self.build_by_default and kwargs.get('install', False):
+ # For backward compatibility, if build_by_default is not explicitly
+ # set, use the value of 'install' if it's enabled.
+ self.build_by_default = True
+
+ self.raw_overrides = kwargs.get('override_options', {})
+
self.add_pch('c', extract_as_list(kwargs, 'c_pch'))
self.add_pch('cpp', extract_as_list(kwargs, 'cpp_pch'))