summaryrefslogtreecommitdiff
path: root/xmake/rules/c++
diff options
context:
space:
mode:
authorruki <[email protected]>2022-02-17 22:41:01 +0800
committerruki <[email protected]>2022-02-17 22:41:01 +0800
commit54efc65b6ed2dfc86c28ba7cc3f40a6084785026 (patch)
treefebf2f4fcc2b80a5e8fb8c372f52742fad3dcd87 /xmake/rules/c++
parentfe5673d0291653137c3ecc53c2abba5c162a6779 (diff)
...
Diffstat (limited to 'xmake/rules/c++')
-rw-r--r--xmake/rules/c++/modules/build_modules/msvc.lua6
1 files changed, 3 insertions, 3 deletions
diff --git a/xmake/rules/c++/modules/build_modules/msvc.lua b/xmake/rules/c++/modules/build_modules/msvc.lua
index 1dc04618f..2b227e354 100644
--- a/xmake/rules/c++/modules/build_modules/msvc.lua
+++ b/xmake/rules/c++/modules/build_modules/msvc.lua
@@ -43,7 +43,7 @@ function load_parent(target, opt)
local sourcebatches = dep:sourcebatches()
if sourcebatches and sourcebatches["c++.build.modules"] then
local cachedir = path.join(dep:autogendir(), "rules", "modules", "cache")
- target:add("cxxflags", "/ifcSearchDir " .. os.args(cachedir), {force = true})
+ target:add("cxxflags", {"/ifcSearchDir", cachedir}, {force = true, expand = false})
end
end
end
@@ -129,7 +129,7 @@ function build_with_batchjobs(target, batchjobs, sourcebatch, opt)
local moduledep = assert(moduledeps_files[sourcefile], "moduledep(%s) not found!", sourcefile)
moduledep.job = batchjobs:newjob(sourcefile, function (index, total)
local opt2 = table.join(opt, {configs = {force = {cxxflags = {interfaceflag,
- outputflag .. " " .. os.args(modulefiles[i]), "/TP"}}}})
+ {outputflag, modulefiles[i]}, "/TP"}}}})
opt2.progress = (index * 100) / total
opt2.objectfile = sourcebatch.objectfiles[i]
opt2.dependfile = sourcebatch.dependfiles[i]
@@ -149,7 +149,7 @@ function build_with_batchjobs(target, batchjobs, sourcebatch, opt)
-- add module flags
target:add("cxxflags", modulesflag)
if cachedir then
- target:add("cxxflags", "/ifcSearchDir " .. os.args(cachedir))
+ target:add("cxxflags", {"/ifcSearchDir", cachedir}, {expand = false})
end
if stdifcdirflag then
for _, toolchain_inst in ipairs(target:toolchains()) do