Renamed deps -> dependencies.

pull/15/head
Jussi Pakkanen 11 years ago
parent f1cc633799
commit 2c65b1f0c3
  1. 2
      build.py
  2. 4
      test cases/frameworks/1 boost/meson.build
  3. 2
      test cases/frameworks/2 gtest/meson.build
  4. 2
      test cases/frameworks/3 gmock/meson.build
  5. 6
      test cases/frameworks/4 qt5/meson.build
  6. 2
      test cases/frameworks/5 protocol buffers/meson.build
  7. 2
      test cases/frameworks/7 gir/meson.build
  8. 2
      test cases/linuxlike/1 pkg-config/meson.build
  9. 2
      test cases/linuxlike/2 external library/meson.build
  10. 2
      test cases/objc/2 nsstring/meson.build
  11. 2
      test cases/vala/1 basic/meson.build
  12. 2
      test cases/vala/2 multiple files/meson.build
  13. 2
      test cases/vala/3 dep/meson.build

@ -261,7 +261,7 @@ class BuildTarget():
if not isinstance(inclist, list):
inclist = [inclist]
self.add_include_dirs(inclist)
deplist = kwargs.get('deps', [])
deplist = kwargs.get('dependencies', [])
if not isinstance(deplist, list):
deplist = [deplist]
self.add_external_deps(deplist)

@ -11,8 +11,8 @@ endif
nolinkdep = dependency('boost', modules: 'utility')
linkdep = dependency('boost', modules : ['thread', 'system'])
nolinkexe = executable('nolinkedexe', 'nolinkexe.cc', deps : nolinkdep)
linkexe = executable('linkedexe', 'linkexe.cc', deps : linkdep)
nolinkexe = executable('nolinkedexe', 'nolinkexe.cc', dependencies : nolinkdep)
linkexe = executable('linkedexe', 'linkexe.cc', dependencies : linkdep)
test('Boost nolinktext', nolinkexe)
test('Boost linktext', linkexe)

@ -2,5 +2,5 @@ project('gtest', 'cpp')
gtest = dependency('gtest', main : true)
e = executable('testprog', 'test.cc', deps : gtest)
e = executable('testprog', 'test.cc', dependencies : gtest)
test('gtest test', e)

@ -6,5 +6,5 @@ project('gmock test', 'cpp')
gtest = dependency('gtest', main : true)
gmock = dependency('gmock')
e = executable('gmocktest', 'gmocktest.cc', deps : [gtest, gmock])
e = executable('gmocktest', 'gmocktest.cc', dependencies : [gtest, gmock])
test('gmock test', e)

@ -7,7 +7,7 @@ sources : ['main.cpp', 'mainWindow.cpp'], # Sources that don't need preprocessin
moc_headers : ['mainWindow.h'], # These need to be fed through the moc tool before use.
ui_files : 'mainWindow.ui', # XML files that need to be compiled with the uic tol.
qresources : 'stuff.qrc', # Resource file for rcc compiler.
deps : qt5dep)
dependencies : qt5dep)
# We need a console test application because some test environments
# do not have an X server.
@ -15,7 +15,7 @@ deps : qt5dep)
qt5core = dependency('qt5', modules : 'Core')
qt5coreapp = executable('q5core', 'q5core.cpp',
deps : qt5core)
dependencies : qt5core)
test('qt5test', qt5coreapp)
@ -26,6 +26,6 @@ q5maninclude = executable('q5maninclude',
sources : 'manualinclude.cpp',
moc_sources : 'mocinclude.cpp',
moc_headers : 'manualinclude.h',
deps : qt5core)
dependencies : qt5core)
test('q5maninclude', q5maninclude)

@ -9,5 +9,5 @@ gen = generator(protoc, \
generated = gen.process('defs.proto')
e = executable('prog', 'main.cpp', generated,
deps : dep)
dependencies : dep)
test('prototest', e)

@ -11,7 +11,7 @@ girc = find_program('g-ir-compiler')
libsources = ['golib.c', 'golib.h']
exe = executable('goprog', libsources, 'prog.c',
deps : [glib, gobj, gir, gmod])
dependencies : [glib, gobj, gir, gmod])
test('gobjtest', exe)

@ -3,7 +3,7 @@ project('external dependency', 'c')
# Zlib is probably on all dev machines.
dep = dependency('zlib')
exe = executable('zlibprog', 'prog.c', deps : dep)
exe = executable('zlibprog', 'prog.c', dependencies : dep)
test('zlibtest', exe)

@ -1,5 +1,5 @@
project('external library', 'c')
zlib = find_library('z')
e = executable('zprog', 'prog.c', deps : zlib)
e = executable('zprog', 'prog.c', dependencies : zlib)
test('libtest', e)

@ -5,5 +5,5 @@ if host.name() == 'darwin'
else
dep = dependency('gnustep')
endif
exe = executable('stringprog', 'stringprog.m', deps : dep)
exe = executable('stringprog', 'stringprog.m', dependencies : dep)
test('stringtest', exe)

@ -2,5 +2,5 @@ project('valatest', 'vala', 'c')
valadeps = [dependency('glib-2.0'), dependency('gobject-2.0')]
e = executable('valaprog', 'prog.vala', deps : valadeps)
e = executable('valaprog', 'prog.vala', dependencies : valadeps)
test('valatest', e)

@ -4,5 +4,5 @@ glib = dependency('glib-2.0')
gobject = dependency('gobject-2.0')
e = executable('prog', 'main.vala', 'class1.vala', 'class2.vala',
deps : [glib, gobject])
dependencies : [glib, gobject])
test('multiple file test', e)

@ -5,5 +5,5 @@ gobject = dependency('gobject-2.0')
gio = dependency('gio-2.0')
e = executable('gioprog', 'gioprog.vala',
deps : [glib, gobject, gio])
dependencies : [glib, gobject, gio])
test('giotest', e)

Loading…
Cancel
Save