summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorruki <[email protected]>2023-01-08 10:51:33 +0800
committerruki <[email protected]>2023-01-08 10:51:33 +0800
commit6cfdc39bc02cc7fcccb82dcb5abd4d30c624db00 (patch)
tree94e421b603fe05a8f2531bfa2a1dc39c2036ac46
parent1b19d2ba990e8714d0298de50d009ee7ff6576e5 (diff)
update changelog
-rw-r--r--CHANGELOG.md8
-rw-r--r--xmake/rules/c++/modules/modules_support/common.lua3
2 files changed, 9 insertions, 2 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index a1980c366..e9908cac2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,10 @@
## master (unreleased)
+### New features
+
+* [#3228](https://github.com/xmake-io/xmake/pull/3228): Add support of importing modules from packages
+
## v2.7.5
### New features
@@ -1487,6 +1491,10 @@
## master (开发中)
+### 新特性
+
+* [#3228](https://github.com/xmake-io/xmake/pull/3228): C++ modules 的安装发布,以及从包中导入 C++ modules 支持
+
## v2.7.5
### 新特性
diff --git a/xmake/rules/c++/modules/modules_support/common.lua b/xmake/rules/c++/modules/modules_support/common.lua
index ace8f2c56..32c1b7be8 100644
--- a/xmake/rules/c++/modules/modules_support/common.lua
+++ b/xmake/rules/c++/modules/modules_support/common.lua
@@ -166,8 +166,8 @@ function cull_unused_modules(target, modules, package_modules_data)
end
-- append all package dependencies
- local module_names = table.keys(package_modules_data) or {}
local culled
+ local module_names = table.keys(package_modules_data)
for _, name in ipairs(module_names) do
culled = culled or {}
if table.find(needed_modules, name) and package_modules_data[name] and not culled[name] then
@@ -179,7 +179,6 @@ function cull_unused_modules(target, modules, package_modules_data)
end
end
end
-
return culled
end