[Libreoffice-commits] core.git: bin/gbuild-to-ide

[Miklos Vajna]

 bin/gbuild-to-ide |    5 +++++
 1 file changed, 5 insertions(+)

New commits:
commit df15d17fa54257019ed92fe65d3a4a200a5f6027
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Tue Mar 29 09:08:48 2016 +0200

    gbuild-to-ide: fix missing include in clang json database
    
    This wasn't noticeable in modules that use '#include "..."' for files in
    the same directory, but does make a difference e.g. in sw.
    
    With this, the include list in the database matches what gbuild in fact
    uses.
    
    Change-Id: I564c70d069fae41ea67ae7e57a188e99fa2ef861

diff --git a/bin/gbuild-to-ide b/bin/gbuild-to-ide
index 3c40b55..f6835bd 100755
--- a/bin/gbuild-to-ide
+++ b/bin/gbuild-to-ide
@@ -448,6 +448,11 @@ class VimIntegrationGenerator(IdeIntegrationGenerator):
             if value is not None:
                 command += '='
                 command += value
+
+        # The directory of the file is missing from lib's include list, as that
+        # one is not the same for all source files in the lib.
+        command += ' -I' + os.path.dirname(file)
+
         for include in lib.include:
             command += ' -I'
             command += include