Skip to content

Fixed include flags for MSC #2508

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
samsinsane merged 1 commit into from
Sep 17, 2025
Merged

Fixed include flags for MSC #2508

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/tools/msc.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -308,15 +308,15 @@
local result = {}
for _, dir in ipairs(dirs) do
dir = p.tools.getrelative(cfg.project, dir)
table.insert(result, '-I' .. p.quoted(dir))
table.insert(result, '/I' .. p.quoted(dir))
end

for _, dir in ipairs(extdirs or {}) do
dir = p.tools.getrelative(cfg.project, dir)
if isVersionGreaterOrEqualTo(cfg.toolset, "msc-v142") then
table.insert(result, '/external:I' .. p.quoted(dir))
else
table.insert(result, '-I' .. p.quoted(dir))
table.insert(result, '/I' .. p.quoted(dir))
end
end

Expand All @@ -325,7 +325,7 @@
if isVersionGreaterOrEqualTo(cfg.toolset, "msc-v142") then
table.insert(result, '/external:I' .. p.quoted(dir))
else
table.insert(result, '-I' .. p.quoted(dir))
table.insert(result, '/I' .. p.quoted(dir))
end
end

Expand Down
8 changes: 4 additions & 4 deletions tests/tools/test_msc.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -340,14 +340,14 @@
function suite.cflags_onExternalIncludeDirs()
externalincludedirs { "/usr/local/include" }
prepare()
test.contains("-I/usr/local/include", msc.getincludedirs(cfg, cfg.includedirs, cfg.externalincludedirs))
test.contains("/I/usr/local/include", msc.getincludedirs(cfg, cfg.includedirs, cfg.externalincludedirs))
end

function suite.cflags_onVs2008ExternalIncludeDirs()
p.action.set("vs2008")
externalincludedirs { "/usr/local/include" }
prepare()
test.contains("-I/usr/local/include", msc.getincludedirs(cfg, cfg.includedirs, cfg.externalincludedirs))
test.contains("/I/usr/local/include", msc.getincludedirs(cfg, cfg.includedirs, cfg.externalincludedirs))
end

function suite.cflags_onVs2022ExternalIncludeDirs()
Expand All @@ -365,14 +365,14 @@
function suite.cflags_onIncludeDirsAfter()
includedirsafter { "/usr/local/include" }
prepare()
test.contains("-I/usr/local/include", msc.getincludedirs(cfg, cfg.includedirs, cfg.externalincludedirs, cfg.frameworkdirs, cfg.includedirsafter))
test.contains("/I/usr/local/include", msc.getincludedirs(cfg, cfg.includedirs, cfg.externalincludedirs, cfg.frameworkdirs, cfg.includedirsafter))
end

function suite.cflags_onVs2008IncludeDirsAfter()
p.action.set("vs2008")
includedirsafter { "/usr/local/include" }
prepare()
test.contains("-I/usr/local/include", msc.getincludedirs(cfg, cfg.includedirs, cfg.externalincludedirs, cfg.frameworkdirs, cfg.includedirsafter))
test.contains("/I/usr/local/include", msc.getincludedirs(cfg, cfg.includedirs, cfg.externalincludedirs, cfg.frameworkdirs, cfg.includedirsafter))
end

function suite.cflags_onVs2022IncludeDirsAfter()
Expand Down
Loading