Regression fix: Don't try to import empty-string custom target include dirs (#4342)

* Don't try to import empty-string custom target include dirs

* Import current directory if custom target dir is empty

This restores the previous behavior and fixes test failures caused by
the previous commit.
pull/4358/merge
Matthias Klumpp 6 years ago committed by Jussi Pakkanen
parent 8cd3e166d8
commit aa27dd7928
  1. 2
      mesonbuild/backend/ninjabackend.py

@ -1944,6 +1944,8 @@ rule FORTRAN_DEP_HACK%s
if not isinstance(i, (build.CustomTarget, build.CustomTargetIndex)):
continue
idir = self.get_target_dir(i)
if not idir:
idir = '.'
if idir not in custom_target_include_dirs:
custom_target_include_dirs.append(idir)
incs = []

Loading…
Cancel
Save