diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2017-12-17 22:42:20 +0200 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2017-12-17 22:42:20 +0200 |
| commit | b949c4792d5893dabbc0cb3dcc2f58aa173d8efc (patch) | |
| tree | a10c2f7879efe16b3df655cfe21f386a557a44be /test cases | |
| parent | ee9832cdb180aad535a37f973148149df5ef3a1c (diff) | |
| download | meson-b949c4792d5893dabbc0cb3dcc2f58aa173d8efc.tar.gz | |
Preserve_path_from should be a kwarg of process(), not generator().
Diffstat (limited to 'test cases')
| -rw-r--r-- | test cases/common/173 preserve gendir/meson.build | 5 | ||||
| -rw-r--r-- | test cases/frameworks/5 protocol buffers/withpath/meson.build | 5 |
2 files changed, 6 insertions, 4 deletions
diff --git a/test cases/common/173 preserve gendir/meson.build b/test cases/common/173 preserve gendir/meson.build index b1a63b1f0..ce219f0d8 100644 --- a/test cases/common/173 preserve gendir/meson.build +++ b/test cases/common/173 preserve gendir/meson.build @@ -4,9 +4,10 @@ gprog = find_program('genprog.py') gen = generator(gprog, \ output : ['@BASENAME@.c', '@BASENAME@.h'], - preserve_path_from : meson.current_source_dir(), arguments : ['--searchdir=@CURRENT_SOURCE_DIR@', '--outdir=@BUILD_DIR@', '@INPUT@']) -generated = gen.process('base.inp', 'com/mesonbuild/subbie.inp') +generated = gen.process('base.inp', 'com/mesonbuild/subbie.inp', + preserve_path_from : meson.current_source_dir()) + e = executable('testprog', 'testprog.c', generated) test('testprog', e) diff --git a/test cases/frameworks/5 protocol buffers/withpath/meson.build b/test cases/frameworks/5 protocol buffers/withpath/meson.build index f5b453ecd..a269c9710 100644 --- a/test cases/frameworks/5 protocol buffers/withpath/meson.build +++ b/test cases/frameworks/5 protocol buffers/withpath/meson.build @@ -4,11 +4,12 @@ gen = generator(protoc, \ output : ['@BASENAME@.pb.cc', '@BASENAME@.pb.h'], - preserve_path_from : meson.current_source_dir(), arguments : ['--proto_path=@CURRENT_SOURCE_DIR@', '--cpp_out=@BUILD_DIR@', '@INPUT@']) generated = gen.process('com/mesonbuild/simple.proto', - 'com/mesonbuild/subsite/complex.proto') + 'com/mesonbuild/subsite/complex.proto', + preserve_path_from : meson.current_source_dir(), + ) e = executable('pathprog', 'pathprog.cpp', generated, dependencies : dep) test('pathprog', e) |