diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2021-03-24 17:18:03 +0200 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2021-03-28 21:52:39 +0300 |
| commit | 8e2f2d8d7e75378cc86650117883558472ac395e (patch) | |
| tree | fb990774f2ba23ead09b558b1108ac5d3c7f149d /mesonbuild/backend/ninjabackend.py | |
| parent | 268a78f0f473c1b5193e8b44a067030b74a6559d (diff) | |
| download | meson-implicitcustom.tar.gz | |
Do not add custom target dir automatically when implicit false.implicitcustom
Diffstat (limited to 'mesonbuild/backend/ninjabackend.py')
| -rw-r--r-- | mesonbuild/backend/ninjabackend.py | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/mesonbuild/backend/ninjabackend.py b/mesonbuild/backend/ninjabackend.py index 594e297db..aa899328d 100644 --- a/mesonbuild/backend/ninjabackend.py +++ b/mesonbuild/backend/ninjabackend.py @@ -2377,10 +2377,8 @@ https://gcc.gnu.org/bugzilla/show_bug.cgi?id=47485''')) commands += self.generate_basic_compiler_args(target, compiler, no_warn_args) # Add custom target dirs as includes automatically, but before # target-specific include directories. - # XXX: Not sure if anyone actually uses this? It can cause problems in - # situations which increase the likelihood for a header name collision, - # such as in subprojects. - commands += self.get_custom_target_dir_include_args(target, compiler) + if target.implicit_include_directories: + commands += self.get_custom_target_dir_include_args(target, compiler) # Add include dirs from the `include_directories:` kwarg on the target # and from `include_directories:` of internal deps of the target. # |