diff options
| -rw-r--r-- | ninjabackend.py | 5 | ||||
| -rw-r--r-- | test cases/common/16 configure file/meson.build | 5 | ||||
| -rw-r--r-- | test cases/common/35 sizeof/meson.build | 2 | ||||
| -rw-r--r-- | test cases/common/36 define10/meson.build | 2 | ||||
| -rw-r--r-- | test cases/common/61 custom target source output/meson.build | 4 | ||||
| -rw-r--r-- | test cases/common/64 custom header generator/meson.build | 3 | ||||
| -rw-r--r-- | test cases/common/65 multiple generators/meson.build | 2 | ||||
| -rw-r--r-- | test cases/common/72 build always/meson.build | 3 |
8 files changed, 13 insertions, 13 deletions
diff --git a/ninjabackend.py b/ninjabackend.py index 4fa4734..66bae36 100644 --- a/ninjabackend.py +++ b/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() diff --git a/test cases/common/16 configure file/meson.build b/test cases/common/16 configure file/meson.build index f381c8e..911a50f 100644 --- a/test cases/common/16 configure file/meson.build +++ b/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')) diff --git a/test cases/common/35 sizeof/meson.build b/test cases/common/35 sizeof/meson.build index 520ed3f..4a0398b 100644 --- a/test cases/common/35 sizeof/meson.build +++ b/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) diff --git a/test cases/common/36 define10/meson.build b/test cases/common/36 define10/meson.build index f56a00a..a28e7e4 100644 --- a/test cases/common/36 define10/meson.build +++ b/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) diff --git a/test cases/common/61 custom target source output/meson.build b/test cases/common/61 custom target source output/meson.build index 1625244..ae65055 100644 --- a/test cases/common/61 custom target source output/meson.build +++ b/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) diff --git a/test cases/common/64 custom header generator/meson.build b/test cases/common/64 custom header generator/meson.build index 3360f23..b422401 100644 --- a/test cases/common/64 custom header generator/meson.build +++ b/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) diff --git a/test cases/common/65 multiple generators/meson.build b/test cases/common/65 multiple generators/meson.build index 969610b..b6fd038 100644 --- a/test cases/common/65 multiple generators/meson.build +++ b/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) diff --git a/test cases/common/72 build always/meson.build b/test cases/common/72 build always/meson.build index 7cb2e4b..f720c89 100644 --- a/test cases/common/72 build always/meson.build +++ b/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) |