Spell out include_directories.

build.py

@@ -273,7 +273,7 @@ class BuildTarget():
             self.set_version(kwargs['version'])
         if 'soversion' in kwargs:
             self.set_soversion(kwargs['soversion'])
-        inclist = kwargs.get('include_dirs', [])
+        inclist = kwargs.get('include_directories', [])
         if not isinstance(inclist, list):
             inclist = [inclist]
         self.add_include_dirs(inclist)

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_dirs : include_directories('.'))
+e = executable('inctest', 'prog.c', include_directories : include_directories('.'))
 test('inctest', e)
 
 # Now generate a header file with an external script.
@@ -25,4 +25,4 @@ output : 'config2.h',
 command : [genprog, scriptfile,  ifile, ofile])
 
 test('inctest2', executable('prog2', 'prog2.c',
-include_dirs : include_directories('.')))
+include_directories : include_directories('.')))

test cases/common/21 includedir/src/meson.build

@@ -1,2 +1,2 @@
-exe = executable('prog', 'prog.c', 'func.c', include_dirs : inc)
+exe = executable('prog', 'prog.c', 'func.c', include_directories : inc)
 test('inc test', exe)

test cases/common/28 config subdir/src/meson.build

@@ -1,2 +1,2 @@
-exe = executable('prog', 'prog.c', include_dirs : inc)
+exe = executable('prog', 'prog.c', include_directories : inc)
 test('subdir config', exe)

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_dirs : include_directories('.'))
+e = executable('prog', 'prog.c', include_directories : include_directories('.'))
 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_dirs : include_directories('.'))
+exe = executable('prog', 'prog.c', include_directories : include_directories('.'))
 test('10test', exe)

test cases/common/49 subproject/meson.build

@@ -9,5 +9,5 @@ endif
 inc = sub.get_variable('i')
 lib = sub.get_variable('l')
 
-e = executable('user', 'user.c', include_dirs : inc, link_with : lib, install : true)
+e = executable('user', 'user.c', include_directories : inc, link_with : lib, install : true)
 test('subdirtest', e)

test cases/common/49 subproject/subprojects/sublib/meson.build

@@ -5,6 +5,6 @@ if not is_subproject()
 endif
 
 i = include_directories('include')
-l = shared_library('sublib', 'sublib.c', include_dirs : i, install : true)
-t = executable('simpletest', 'simpletest.c', include_dirs : i, link_with : l)
+l = shared_library('sublib', 'sublib.c', include_directories : i, install : true)
+t = executable('simpletest', 'simpletest.c', include_directories : i, link_with : l)
 test('plain', t)

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

@@ -6,6 +6,6 @@ command : [find_program('generator.py'), meson.current_build_dir()],
 )
 
 e = executable('prog', 'main.c', ct,
-include_dirs : include_directories('.')
+include_directories : include_directories('.')
 )
 test('gentest', e)