From f49ad74c7572c2c4feec20b2d123952e13ec788d Mon Sep 17 00:00:00 2001 From: Rico Tzschichholz Date: Thu, 8 Feb 2018 16:14:42 +0100 Subject: [PATCH] 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 --- compiler/valacompiler.vala | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/compiler/valacompiler.vala b/compiler/valacompiler.vala index a05f0e5be..1fcc7228a 100644 --- a/compiler/valacompiler.vala +++ b/compiler/valacompiler.vala @@ -448,7 +448,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 -- 2.47.2