Make sure that build and source subdirectories are always in search

path.

ninjabackend.py

@@ -1103,6 +1103,11 @@ rule FORTRAN_DEP_HACK
         compiler = self.get_compiler_for_source(src)
         commands = self.generate_basic_compiler_args(target, compiler)
         commands += compiler.get_include_args(self.get_target_private_dir(target))
+        curdir = target.get_subdir()
+        commands += compiler.get_include_args(os.path.join(self.build_to_src, curdir))
+        if curdir ==  '':
+            curdir = '.'
+        commands += compiler.get_include_args(curdir)
         for d in target.external_deps:
             if d.need_threads():
                 commands += compiler.thread_flags()

test cases/common/16 configure file/meson.build

@@ -11,7 +11,7 @@ configure_file(input : 'config.h.in',
 output : 'config.h',
 configuration : conf)
 
-e = executable('inctest', 'prog.c', include_directories : include_directories('.'))
+e = executable('inctest', 'prog.c')
 test('inctest', e)
 
 # Now generate a header file with an external script.
@@ -25,5 +25,4 @@ output : 'config2.h',
 command : [genprog, scriptfile,  ifile, ofile],
 install_dir : 'share/appdir')
 
-test('inctest2', executable('prog2', 'prog2.c',
-include_directories : include_directories('.')))
+test('inctest2', executable('prog2', 'prog2.c'))

test cases/common/35 sizeof/meson.build

@@ -9,5 +9,5 @@ cd.set('INTSIZE', intsize)
 cd.set('WCHARSIZE', wcharsize)
 configure_file(input : 'config.h.in', output : 'config.h', configuration : cd)
 
-e = executable('prog', 'prog.c', include_directories : include_directories('.'))
+e = executable('prog', 'prog.c')
 test('sizeof test', e)

test cases/common/36 define10/meson.build

@@ -8,5 +8,5 @@ configure_file(input : 'config.h.in',
  output : 'config.h',
   configuration : conf)
 
-exe = executable('prog', 'prog.c', include_directories : include_directories('.'))
+exe = executable('prog', 'prog.c')
 test('10test', exe)

test cases/common/61 custom target source output/meson.build

@@ -5,7 +5,5 @@ output : ['mylib.h', 'mylib.c'],
 command : [find_program('generator.py'), meson.current_build_dir()],
 )
 
-e = executable('prog', 'main.c', ct,
-include_directories : include_directories('.')
-)
+e = executable('prog', 'main.c', ct)
 test('gentest', e)

test cases/common/64 custom header generator/meson.build

@@ -7,6 +7,5 @@ output : 'myheader.lh', # Suffix not .h to ensure this works with custom suffixe
 input : 'input.def',
 command : [gen, '@INPUT0@', '@OUTPUT0@'])
 
-prog = executable('prog', 'prog.c', generated_h,
-include_directories : include_directories('.'))
+prog = executable('prog', 'prog.c', generated_h)
 test('gentest', prog)

test cases/common/65 multiple generators/meson.build

@@ -9,5 +9,5 @@ input : 'data2.dat',
 command : [comp, '@INPUT0@', meson.current_build_dir()])
 
 exe = executable('prog', 'main.cpp', generated, generated2,
-include_directories : include_directories('subdir', '.'))
+include_directories : include_directories('subdir'))
 test('generated test', exe)

test cases/common/72 build always/meson.build

@@ -11,5 +11,4 @@ command : [vgen, '@INPUT@', '@OUTPUT@', version],
 build_always : true,
 )
 
-executable('versionprinter', 'main.c', version_src,
-include_directories : include_directories('.'))
+executable('versionprinter', 'main.c', version_src)