diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2015-08-27 01:07:14 +0300 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2015-08-27 01:07:14 +0300 |
| commit | f32db9afa27992df1e40fece4ffd40fd5f3768ae (patch) | |
| tree | 15a1f39781cdd481de5a8152ebb1dd1c0748dcf1 | |
| parent | ed32ee1bdc635308212df2b3e3b2131ad25b458e (diff) | |
| download | meson-f32db9afa27992df1e40fece4ffd40fd5f3768ae.zip meson-f32db9afa27992df1e40fece4ffd40fd5f3768ae.tar.gz meson-f32db9afa27992df1e40fece4ffd40fd5f3768ae.tar.bz2 | |
Generator outputs are all relative.
| -rw-r--r-- | ninjabackend.py | 3 | ||||
| -rw-r--r-- | test cases/frameworks/5 protocol buffers/meson.build | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/ninjabackend.py b/ninjabackend.py index dab095b..b9122ee 100644 --- a/ninjabackend.py +++ b/ninjabackend.py @@ -1062,7 +1062,8 @@ rule FORTRAN_DEP_HACK args = [x.replace("@INPUT@", infilename).replace('@OUTPUT@', sole_output)\ for x in base_args] args = self.replace_outputs(args, self.get_target_private_dir(target), outfilelist) - args = [x.replace("@SOURCE_DIR@", self.environment.get_source_dir()).replace("@BUILD_DIR@", self.get_target_private_dir(target)) + relout = os.path.join(target.subdir, target.get_basename() + target.type_suffix()) + args = [x.replace("@SOURCE_DIR@", self.build_to_src).replace("@BUILD_DIR@", relout) for x in args] cmdlist = exe_arr + args elem = NinjaBuildElement(outfiles, 'CUSTOM_COMMAND', infilename) diff --git a/test cases/frameworks/5 protocol buffers/meson.build b/test cases/frameworks/5 protocol buffers/meson.build index dbc6bfa..5c28344 100644 --- a/test cases/frameworks/5 protocol buffers/meson.build +++ b/test cases/frameworks/5 protocol buffers/meson.build @@ -5,7 +5,7 @@ dep = dependency('protobuf') gen = generator(protoc, \ output : ['@BASENAME@.pb.cc', '@BASENAME@.pb.h'], - arguments : ['-I=@SOURCE_DIR@', '--cpp_out=@BUILD_DIR@', '@INPUT@']) + arguments : ['--proto_path=@SOURCE_DIR@', '--cpp_out=@BUILD_DIR@', '@INPUT@']) generated = gen.process('defs.proto') e = executable('prog', 'main.cpp', generated, |