From 3cf7c6aa0cce1b07527b2bc19594f86c972bfc26 Mon Sep 17 00:00:00 2001
From: Dimitar Dobrev <dpldobrev@protonmail.com>
Date: Thu, 31 Aug 2017 23:03:41 +0300
Subject: [PATCH] Moved the searching for a VS SDK to a separate method.

Signed-off-by: Dimitar Dobrev <dpldobrev@protonmail.com>
---
 src/Core/Toolchains/MSVCToolchain.cs | 28 +++++++++++++++++++---------
 1 file changed, 19 insertions(+), 9 deletions(-)

diff --git a/src/Core/Toolchains/MSVCToolchain.cs b/src/Core/Toolchains/MSVCToolchain.cs
index fa2b35d4..271e0aba 100644
--- a/src/Core/Toolchains/MSVCToolchain.cs
+++ b/src/Core/Toolchains/MSVCToolchain.cs
@@ -169,18 +169,28 @@ namespace CppSharp
         /// system includes are actually got from.</param>
         public static List<string> GetSystemIncludes(VisualStudioVersion wantedVsVersion,
             out VisualStudioVersion foundVsVersion)
+        {
+            var vsSdk = GetVisualStudioSdk(wantedVsVersion, out foundVsVersion);
+            var vsDir = vsSdk.Directory;
+            if (Path.GetFileName(vsDir) == "IDE")
+            {
+                string secondToLastDirPath = Path.GetDirectoryName(vsDir);
+                if (Path.GetFileName(secondToLastDirPath) == "Common7")
+                    vsDir = Path.GetDirectoryName(secondToLastDirPath);
+            }
+            return GetSystemIncludes(foundVsVersion, vsDir);
+        }
+
+        private static ToolchainVersion GetVisualStudioSdk(
+            VisualStudioVersion wantedVsVersion, out VisualStudioVersion foundVsVersion)
         {
             if (wantedVsVersion != VisualStudioVersion.Latest)
             {
                 var vsSdk = GetVSToolchain(wantedVsVersion);
                 if (vsSdk.IsValid)
                 {
-                    var vsDir = vsSdk.Directory;
-                    vsDir = vsDir.Substring(0, vsDir.LastIndexOf(@"\Common7\IDE",
-                        StringComparison.Ordinal));
-
                     foundVsVersion = wantedVsVersion;
-                    return GetSystemIncludes(wantedVsVersion, vsDir);
+                    return vsSdk;
                 }
             }
 
@@ -188,13 +198,13 @@ namespace CppSharp
             // so start from the latest specified version and loop until a match is found 
             for (var i = VisualStudioVersion.Latest - 1; i >= VisualStudioVersion.VS2012; i--)
             {
-                var includes = GetSystemIncludes(i, out foundVsVersion);
-                if (includes.Count > 0)
-                    return includes;
+                var vsSdk = GetVisualStudioSdk(i, out foundVsVersion);
+                if (vsSdk.IsValid)
+                    return vsSdk;
             }
 
             foundVsVersion = VisualStudioVersion.Latest;
-            return new List<string>();
+            return new ToolchainVersion();
         }
 
         private static void DumpSdks(string sku, IEnumerable<ToolchainVersion> sdks)