Merge branch 'master' of https://github.com/Agrael1/IncludeToolbox

Agrael1 · Dec 2, 2022 · 5a3e2d3 · 5a3e2d3
2 parents 00af536 + a19fc6f
commit 5a3e2d3
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 48 deletions.
diff --git a/IncludeToolboxShared/Commands/TransitiveRemoval.cs b/IncludeToolboxShared/Commands/TransitiveRemoval.cs
diff --git a/IncludeToolboxShared/IncludeToolboxShared.projitems b/IncludeToolboxShared/IncludeToolboxShared.projitems
@@ -16,13 +16,11 @@
     <Compile Include="$(MSBuildThisFileDirectory)Commands\FormatIncludes.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Commands\IncludeGraph.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Commands\RunIWYU.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Commands\TransitiveRemoval.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Commands\TrialAndErrorRemoval_CodeWindow.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Commands\TrialAndErrorRemoval_Project.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Graph\IncludeGraph.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Implementation\IncludeFormatter.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)IncludeToolboxPackage.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Options\TransitiveOptions.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)ToolWindows\ViewModel\IncludeTreeViewItem.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)IWYU\IWYU.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)IWYU\IWYUApply.cs" />

diff --git a/IncludeToolboxShared/Options/TransitiveOptions.cs b/IncludeToolboxShared/Options/TransitiveOptions.cs
diff --git a/IncludeToolboxShared/Util/VCUtil.cs b/IncludeToolboxShared/Util/VCUtil.cs
@@ -76,8 +76,14 @@ public static async Task<IEnumerable<string>> GetIncludeDirsAsync()
             var cfg = proj.ActiveConfiguration;
             var cl = cfg?.Rules;
             if (cl == null) { VS.MessageBox.ShowErrorAsync("IWYU Error:", "Failed to gather Compiler info.").FireAndForget(); return null; }
+
+
             var com = (IVCRulePropertyStorage2)cl.Item("CL");
-            var dirs = com.GetEvaluatedPropertyValue("AdditionalIncludeDirectories").Replace('\\','/')
+
+            string property = com!=null? "AdditionalIncludeDirectories": "IncludePath";
+            com ??= (IVCRulePropertyStorage2)cl.Item("ConfigurationDirectories");            
+
+            var dirs = com.GetEvaluatedPropertyValue(property).Replace('\\','/')
                 .Split(';').Where(s => !string.IsNullOrWhiteSpace(s)).Select(s=>Path.IsPathRooted(s)?s:Path.Combine(dir, s));
             return dirs;
         }