diff options
| author | Rico Tzschichholz <ricotz@ubuntu.com> | 2018-02-08 16:14:42 +0100 |
|---|---|---|
| committer | Rico Tzschichholz <ricotz@ubuntu.com> | 2018-02-08 16:16:36 +0100 |
| commit | 8d8fafdd6590ff32d59170395853034764daa055 (patch) | |
| tree | f01536caf3ebdf5debc0b65a9fb0b337bea79622 /compiler | |
| parent | 285bb246b2ea29387b3d01d3a3888a7e3b21b306 (diff) | |
| download | vala-8d8fafdd6590ff32d59170395853034764daa055.tar.gz | |
compiler: Prefix headers for set_cheader_override() if includedir is given
We need to account for changes done by SourceFile.get_cinclude_filename()
https://bugzilla.gnome.org/show_bug.cgi?id=793299
Diffstat (limited to 'compiler')
| -rw-r--r-- | compiler/valacompiler.vala | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/compiler/valacompiler.vala b/compiler/valacompiler.vala index 9d4d36b95..522b41ac5 100644 --- a/compiler/valacompiler.vala +++ b/compiler/valacompiler.vala @@ -474,7 +474,15 @@ class Vala.Compiler { } var interface_writer = new CodeWriter (CodeWriterType.INTERNAL); - interface_writer.set_cheader_override(header_filename, internal_header_filename); + + if (context.includedir != null) { + var prefixed_header_filename = Path.build_path ("/", context.includedir, Path.get_basename (header_filename)); + var prefixed_internal_header_filename = Path.build_path ("/", context.includedir, Path.get_basename (internal_header_filename)); + interface_writer.set_cheader_override (prefixed_header_filename, prefixed_internal_header_filename); + } else { + interface_writer.set_cheader_override (header_filename, internal_header_filename); + } + string vapi_filename = internal_vapi_filename; // put .vapi file in current directory unless -d has been explicitly specified |