aboutsummaryrefslogtreecommitdiff
path: root/mesonbuild/backend/ninjabackend.py
diff options
context:
space:
mode:
authorJussi Pakkanen <jpakkane@gmail.com>2017-01-14 17:36:12 +0200
committerJussi Pakkanen <jpakkane@gmail.com>2017-01-15 19:45:23 +0200
commitdb8ad2a4bd4ed1e962e1cbfa76bd8abdf5e83b0e (patch)
treed94324a7da9d14f6cb8542938bcef23633413a50 /mesonbuild/backend/ninjabackend.py
parentb1087f011cb815a5214791ab92e7214e01b45b72 (diff)
downloadmeson-db8ad2a4bd4ed1e962e1cbfa76bd8abdf5e83b0e.zip
meson-db8ad2a4bd4ed1e962e1cbfa76bd8abdf5e83b0e.tar.gz
meson-db8ad2a4bd4ed1e962e1cbfa76bd8abdf5e83b0e.tar.bz2
Add test for build_on_all.
Diffstat (limited to 'mesonbuild/backend/ninjabackend.py')
-rw-r--r--mesonbuild/backend/ninjabackend.py9
1 files changed, 3 insertions, 6 deletions
diff --git a/mesonbuild/backend/ninjabackend.py b/mesonbuild/backend/ninjabackend.py
index cace3b3..a051baf 100644
--- a/mesonbuild/backend/ninjabackend.py
+++ b/mesonbuild/backend/ninjabackend.py
@@ -2163,13 +2163,10 @@ rule FORTRAN_DEP_HACK
def get_build_on_all_targets(self):
result = []
for t in self.build.get_targets().values():
- if t.build_on_all:
+ if t.build_on_all or \
+ (hasattr(t, 'install') and t.install) or\
+ (hasattr(t, 'build_always') and t.build_always):
result.append(t)
- # CustomTargets that aren't installed should only be built if
- # they are used by something else or are to always be built
- if isinstance(t, build.CustomTarget):
- if t.install or t.build_always:
- result.append(t)
return result
def generate_ending(self, outfile):