diff options
Diffstat (limited to 'mesonbuild')
| -rw-r--r-- | mesonbuild/backend/ninjabackend.py | 6 | ||||
| -rw-r--r-- | mesonbuild/build.py | 14 |
2 files changed, 10 insertions, 10 deletions
diff --git a/mesonbuild/backend/ninjabackend.py b/mesonbuild/backend/ninjabackend.py index e861bf7..668d6c4 100644 --- a/mesonbuild/backend/ninjabackend.py +++ b/mesonbuild/backend/ninjabackend.py @@ -2160,17 +2160,17 @@ rule FORTRAN_DEP_HACK elem.add_item('pool', 'console') elem.write(outfile) - def get_build_on_all_targets(self): + def get_build_by_default_targets(self): result = [] for t in self.build.get_targets().values(): - if t.build_on_all or t.install or t.build_always: + if t.build_by_default or t.install or t.build_always: result.append(t) return result def generate_ending(self, outfile): targetlist = [] ctlist = [] - for t in self.get_build_on_all_targets(): + for t in self.get_build_by_default_targets(): if isinstance(t, build.CustomTarget): # Create a list of all custom target outputs for o in t.get_outputs(): diff --git a/mesonbuild/build.py b/mesonbuild/build.py index b01c280..91815fa 100644 --- a/mesonbuild/build.py +++ b/mesonbuild/build.py @@ -44,7 +44,7 @@ known_basic_kwargs = {'install': True, 'sources': True, 'objects': True, 'native': True, - 'build_on_all': True, + 'build_by_default': True, } # These contain kwargs supported by both static and shared libraries. These are @@ -254,10 +254,10 @@ class EnvironmentVariables(): return env class Target: - def __init__(self, name, subdir, build_on_all): + def __init__(self, name, subdir, build_by_default): self.name = name self.subdir = subdir - self.build_on_all = build_on_all + self.build_by_default = build_by_default self.install = False self.build_always = False @@ -268,10 +268,10 @@ class Target: return self.subdir def process_kwargs(self, kwargs): - if 'build_on_all' in kwargs: - self.build_on_all = kwargs['build_on_all'] - if not isinstance(self.build_on_all, bool): - raise InvalidArguments('build_on_all must be a boolean value.') + 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.') class BuildTarget(Target): def __init__(self, name, subdir, subproject, is_cross, sources, objects, environment, kwargs): |