Skip to content

Commit 1e1ded9

Browse files
committed
Fixed include flags for MSC
1 parent 663eb34 commit 1e1ded9

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

src/tools/msc.lua

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -308,15 +308,15 @@
308308
local result = {}
309309
for _, dir in ipairs(dirs) do
310310
dir = p.tools.getrelative(cfg.project, dir)
311-
table.insert(result, '-I' .. p.quoted(dir))
311+
table.insert(result, '/I' .. p.quoted(dir))
312312
end
313313

314314
for _, dir in ipairs(extdirs or {}) do
315315
dir = p.tools.getrelative(cfg.project, dir)
316316
if isVersionGreaterOrEqualTo(cfg.toolset, "msc-v142") then
317317
table.insert(result, '/external:I' .. p.quoted(dir))
318318
else
319-
table.insert(result, '-I' .. p.quoted(dir))
319+
table.insert(result, '/I' .. p.quoted(dir))
320320
end
321321
end
322322

@@ -325,7 +325,7 @@
325325
if isVersionGreaterOrEqualTo(cfg.toolset, "msc-v142") then
326326
table.insert(result, '/external:I' .. p.quoted(dir))
327327
else
328-
table.insert(result, '-I' .. p.quoted(dir))
328+
table.insert(result, '/I' .. p.quoted(dir))
329329
end
330330
end
331331

tests/tools/test_msc.lua

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -340,14 +340,14 @@
340340
function suite.cflags_onExternalIncludeDirs()
341341
externalincludedirs { "/usr/local/include" }
342342
prepare()
343-
test.contains("-I/usr/local/include", msc.getincludedirs(cfg, cfg.includedirs, cfg.externalincludedirs))
343+
test.contains("/I/usr/local/include", msc.getincludedirs(cfg, cfg.includedirs, cfg.externalincludedirs))
344344
end
345345

346346
function suite.cflags_onVs2008ExternalIncludeDirs()
347347
p.action.set("vs2008")
348348
externalincludedirs { "/usr/local/include" }
349349
prepare()
350-
test.contains("-I/usr/local/include", msc.getincludedirs(cfg, cfg.includedirs, cfg.externalincludedirs))
350+
test.contains("/I/usr/local/include", msc.getincludedirs(cfg, cfg.includedirs, cfg.externalincludedirs))
351351
end
352352

353353
function suite.cflags_onVs2022ExternalIncludeDirs()
@@ -365,14 +365,14 @@
365365
function suite.cflags_onIncludeDirsAfter()
366366
includedirsafter { "/usr/local/include" }
367367
prepare()
368-
test.contains("-I/usr/local/include", msc.getincludedirs(cfg, cfg.includedirs, cfg.externalincludedirs, cfg.frameworkdirs, cfg.includedirsafter))
368+
test.contains("/I/usr/local/include", msc.getincludedirs(cfg, cfg.includedirs, cfg.externalincludedirs, cfg.frameworkdirs, cfg.includedirsafter))
369369
end
370370

371371
function suite.cflags_onVs2008IncludeDirsAfter()
372372
p.action.set("vs2008")
373373
includedirsafter { "/usr/local/include" }
374374
prepare()
375-
test.contains("-I/usr/local/include", msc.getincludedirs(cfg, cfg.includedirs, cfg.externalincludedirs, cfg.frameworkdirs, cfg.includedirsafter))
375+
test.contains("/I/usr/local/include", msc.getincludedirs(cfg, cfg.includedirs, cfg.externalincludedirs, cfg.frameworkdirs, cfg.includedirsafter))
376376
end
377377

378378
function suite.cflags_onVs2022IncludeDirsAfter()

0 commit comments

Comments
 (0)