Merge pull request #4534 from star-hengxing/compile_commands

improve compile_commands

1 files changed, 5 insertions, 0 deletions

diff --git a/xmake/plugins/project/clang/compile_commands.lua b/xmake/plugins/project/clang/compile_commands.lua
index 68ba71c48..136de4bf1 100644
--- a/xmake/plugins/project/clang/compile_commands.lua
+++ b/xmake/plugins/project/clang/compile_commands.lua
@@ -62,6 +62,7 @@ function _get_windows_sdk_arguments(target)
         local envs = msvc:runenvs()
         local WindowsSdkDir = envs.WindowsSdkDir
         local WindowsSDKVersion = envs.WindowsSDKVersion
+        local VCToolsInstallDir = envs.VCToolsInstallDir
         if WindowsSdkDir and WindowsSDKVersion then
             local includedirs = os.dirs(path.join(WindowsSdkDir, "Include", envs.WindowsSDKVersion, "*"))
             for _, tool in ipairs({"atlmfc", "diasdk"}) do
@@ -71,6 +72,10 @@ function _get_windows_sdk_arguments(target)
                 end
             end
 
+            if VCToolsInstallDir then
+                table.insert(includedirs, path.join(VCToolsInstallDir, "include"))
+            end
+
             for _, dir in ipairs(includedirs) do
                 table.insert(args, "-imsvc")
                 table.insert(args, dir)