diff options
| author | Arthur LAURENT <[email protected]> | 2022-12-04 22:39:05 +0100 |
|---|---|---|
| committer | Arthur LAURENT <[email protected]> | 2022-12-04 22:49:47 +0100 |
| commit | 54d1c3ba54069b36337e6ba269f33a3bf148b476 (patch) | |
| tree | 8d39695770da2d65a2e8b5e7b9ca18f7e3b1dd71 /xmake/rules/c++ | |
| parent | e5ddfba800683c9a0ee54445f3cab42defab11ed (diff) | |
internalpartition is not msvc specific
Diffstat (limited to 'xmake/rules/c++')
| -rw-r--r-- | xmake/rules/c++/modules/modules_support/common.lua | 2 | ||||
| -rw-r--r-- | xmake/rules/c++/modules/modules_support/msvc.lua | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/xmake/rules/c++/modules/modules_support/common.lua b/xmake/rules/c++/modules/modules_support/common.lua index ad8f94549..4314fd4a5 100644 --- a/xmake/rules/c++/modules/modules_support/common.lua +++ b/xmake/rules/c++/modules/modules_support/common.lua @@ -444,7 +444,7 @@ function fallback_generate_dependencies(target, jsonfile, sourcefile, preprocess local module_deps_set = hashset.new() local sourcecode = preprocess_file(sourcefile) or io.readfile(sourcefile) local fileconfig = target:fileconfig(sourcefile) - local internalpartition = (fileconfig and fileconfig.values) and fileconfig.values["msvc.internalpartition"] or false + local internalpartition = (fileconfig and fileconfig.values) and fileconfig.values["internalpartition"] or false sourcecode = sourcecode:gsub("//.-\n", "\n") sourcecode = sourcecode:gsub("/%*.-%*/", "") for _, line in ipairs(sourcecode:split("\n", {plain = true})) do diff --git a/xmake/rules/c++/modules/modules_support/msvc.lua b/xmake/rules/c++/modules/modules_support/msvc.lua index c1c0e76cf..484076521 100644 --- a/xmake/rules/c++/modules/modules_support/msvc.lua +++ b/xmake/rules/c++/modules/modules_support/msvc.lua @@ -470,7 +470,7 @@ function build_modules_for_batchjobs(target, batchjobs, objectfiles, modules, op dependfile = target:dependfile(provide.bmi) local fileconfig = target:fileconfig(provide.sourcefile) - if fileconfig and fileconfig.values and fileconfig.values["msvc.internalpartition"] then + if not provide.interface then assert(internalpartitionflag, "/internalPartition not supported !") table.insert(flags, internalpartitionflag) elseif provide.interface then @@ -559,7 +559,7 @@ function build_modules_for_batchcmds(target, batchcmds, objectfiles, modules, op table.join2(flags, {ifcoutputflag, path(provide.bmi)}) local fileconfig = target:fileconfig(cppfile) - if fileconfig and fileconfig.values and fileconfig.values["msvc.internalpartition"] then + if not provide.interface then assert(internalpartitionflag, "/internalPartition not supported !") table.insert(flags, internalpartitionflag) elseif provide.interface then |