Improve handling of MSVC include flags in compile commands logger (#334)

bkryza · Nov 11, 2024 · 9895a38 · 9895a38
1 parent d742fb7
commit 9895a38
Showing 1 changed file with 12 additions and 4 deletions.
diff --git a/util/msbuild_compile_commands_logger/CompileCommandsLogger.cs b/util/msbuild_compile_commands_logger/CompileCommandsLogger.cs
@@ -42,7 +42,7 @@ public class CompileCommandsLogger : Logger
     private static readonly string CCompilerFrontend = "clang.exe";
     private static readonly string CPPCompilerFrontend = "clang++.exe";
 
-    private static readonly string[] IgnoredFlags = {"/MP", "/Gm-"};
+    private static readonly string[] SourceFileTypeQualifierFlags = {"/Tc", "/Tp"};
 
     private static readonly string[] CppExtensions = { ".cpp", ".cxx", ".cc", ".c" };
 
@@ -99,12 +99,13 @@ private void EventSource_AnyEventRaised(object sender, BuildEventArgs args)
             List<string> filenames = new List<string>();
             List<string> compileFlags = new List<string>();
 
-
-
             // Here we assume that source files are at the end of the command and are absolute
             int argIndex = cmdArgs.Length - 1;
             for(;argIndex >= 0; argIndex--) {
-                if(IsCPPSourcePath(cmdArgs[argIndex])) {
+                if(SourceFileTypeQualifierFlags.Contains(cmdArgs[argIndex])) {
+                    continue;
+                }
+                else if(IsCPPSourcePath(cmdArgs[argIndex])) {
                     filenames.Add(cmdArgs[argIndex]);
                 }
                 else {
@@ -113,6 +114,13 @@ private void EventSource_AnyEventRaised(object sender, BuildEventArgs args)
             }
 
             for(int i = 0; i < argIndex; i++) {
+                if(cmdArgs[i] == "/I") {
+                    compileFlags.Add("-isystem" + cmdArgs[i+1]);
+                    i++;
+
+                    continue;
+                }
+
                 if(cmdArgs[i].StartsWith("/I")) {
                     compileFlags.Add("-isystem");
                     compileFlags.Add("\"" + cmdArgs[i].Substring(2) + "\"");