diff options
| author | Arthur LAURENT <[email protected]> | 2022-12-05 14:48:44 +0100 |
|---|---|---|
| committer | Arthur LAURENT <[email protected]> | 2022-12-05 15:45:54 +0100 |
| commit | 718cccc5df0b1fe28cb80256dd325b57f3e44063 (patch) | |
| tree | 2564b10d32df38604d5dfb4cb316b105d620571d /xmake/rules/c++/modules/modules_support/msvc.lua | |
| parent | 54d1c3ba54069b36337e6ba269f33a3bf148b476 (diff) | |
try to detect internal partition automatically on fallback generation
Diffstat (limited to 'xmake/rules/c++/modules/modules_support/msvc.lua')
| -rw-r--r-- | xmake/rules/c++/modules/modules_support/msvc.lua | 20 |
1 files changed, 2 insertions, 18 deletions
diff --git a/xmake/rules/c++/modules/modules_support/msvc.lua b/xmake/rules/c++/modules/modules_support/msvc.lua index 484076521..0004c138c 100644 --- a/xmake/rules/c++/modules/modules_support/msvc.lua +++ b/xmake/rules/c++/modules/modules_support/msvc.lua @@ -466,16 +466,8 @@ function build_modules_for_batchjobs(target, batchjobs, objectfiles, modules, op local dependfile = target:dependfile(objectfile) if provide then - table.join2(flags, {ifcoutputflag, provide.bmi}) + table.join2(flags, {ifcoutputflag, path(provide.bmi), provide.interface and interfaceflag or internalpartitionflag}) dependfile = target:dependfile(provide.bmi) - - local fileconfig = target:fileconfig(provide.sourcefile) - if not provide.interface then - assert(internalpartitionflag, "/internalPartition not supported !") - table.insert(flags, internalpartitionflag) - elseif provide.interface then - table.insert(flags, interfaceflag) - end end table.join2(moduleinfo, { @@ -556,15 +548,7 @@ function build_modules_for_batchcmds(target, batchcmds, objectfiles, modules, op local flags = table.join({"-TP", "-c", path(cppfile), path(objectfile, function (p) return "-Fo" .. p end)}) if provide or common.has_module_extension(cppfile) then if provide then - table.join2(flags, {ifcoutputflag, path(provide.bmi)}) - - local fileconfig = target:fileconfig(cppfile) - if not provide.interface then - assert(internalpartitionflag, "/internalPartition not supported !") - table.insert(flags, internalpartitionflag) - elseif provide.interface then - table.insert(flags, interfaceflag) - end + table.join2(flags, {ifcoutputflag, path(provide.bmi), provide.interface and interfaceflag or internalpartitionflag}) end batchcmds:show_progress(opt.progress, "${color.build.object}compiling.module.$(mode) %s", name or cppfile) |