diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2021-03-24 17:18:03 +0200 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2021-03-24 17:18:03 +0200 |
| commit | e4c23c63ae7f15f8aff32a256483c50c1c7b61f3 (patch) | |
| tree | d130ef6b97359fc076855979e8c04bf9ecf0d59f /mesonbuild | |
| parent | 703fd6d1fa32e2b5e706a7b6d726de7a3791fdec (diff) | |
| download | meson-implicitcustom.zip meson-implicitcustom.tar.gz meson-implicitcustom.tar.bz2 | |
Do not add custom target dir automatically when implicit false. Closes #8562.implicitcustom
Diffstat (limited to 'mesonbuild')
| -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 594e297..aa89932 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. # |