diff options
author | Jussi Pakkanen <jpakkane@gmail.com> | 2017-07-31 11:35:25 -0400 |
---|---|---|
committer | Jussi Pakkanen <jpakkane@gmail.com> | 2017-08-04 20:23:22 +0300 |
commit | ef2257bb4e9a6eb83301907d9fdf01d810dc925c (patch) | |
tree | 28fa87ab09aee6c8d0209fe2a51da835977b8639 /mesonbuild/backend/ninjabackend.py | |
parent | 7f307fd5ef3547152c7d48fd362dd511dd94b9d3 (diff) | |
download | meson-dotinclude.zip meson-dotinclude.tar.gz meson-dotinclude.tar.bz2 |
Add option to disable implicit include directories. Closes #2139.dotinclude
Diffstat (limited to 'mesonbuild/backend/ninjabackend.py')
-rw-r--r-- | mesonbuild/backend/ninjabackend.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/mesonbuild/backend/ninjabackend.py b/mesonbuild/backend/ninjabackend.py index 5fc6d6b..7b2cdb1 100644 --- a/mesonbuild/backend/ninjabackend.py +++ b/mesonbuild/backend/ninjabackend.py @@ -2033,9 +2033,11 @@ rule FORTRAN_DEP_HACK # srcdir == builddir Autotools build in their source tree. Many # projects that are moving to Meson have both Meson and Autotools in # parallel as part of the transition. - commands += self.get_source_dir_include_args(target, compiler) + if target.implicit_include_directories: + commands += self.get_source_dir_include_args(target, compiler) commands += self.get_custom_target_dir_include_args(target, compiler) - commands += self.get_build_dir_include_args(target, compiler) + if target.implicit_include_directories: + commands += self.get_build_dir_include_args(target, compiler) # Finally add the private dir for the target to the include path. This # must override everything else and must be the final path added. commands += compiler.get_include_args(self.get_target_private_dir(target), False) |