From 1b2808af7509375c04644a05a109d641886a61ce Mon Sep 17 00:00:00 2001 From: ruki Date: Tue, 27 Apr 2021 22:51:19 +0800 Subject: improve to register packages --- .../action/require/impl/register_packages.lua | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) (limited to 'xmake/modules') diff --git a/xmake/modules/private/action/require/impl/register_packages.lua b/xmake/modules/private/action/require/impl/register_packages.lua index 9bc1c52cb..630ae89fe 100644 --- a/xmake/modules/private/action/require/impl/register_packages.lua +++ b/xmake/modules/private/action/require/impl/register_packages.lua @@ -88,20 +88,21 @@ function _register_required_package(instance, required_package) _register_required_package_base(instance, required_package) _register_required_package_libs(instance, required_package) _register_required_package_envs(instance, envs) - local orderdeps = instance:orderdeps() - if orderdeps then - local total = #orderdeps - for idx, _ in ipairs(orderdeps) do - local dep = orderdeps[total + 1 - idx] + local linkdeps = instance:linkdeps() + if linkdeps then + local total = #linkdeps + for idx, _ in ipairs(linkdeps) do + local dep = linkdeps[total + 1 - idx] if dep then - -- we can only inherit all link deps of library package - if instance:is_library() then - _register_required_package_libs(dep, required_package, true) - end - _register_required_package_envs(dep, envs) + _register_required_package_libs(dep, required_package, true) end end end + for _, dep in ipairs(instance:orderdeps()) do + if not dep:is_private() then + _register_required_package_envs(dep, envs) + end + end if #table.keys(envs) > 0 then required_package:add({envs = envs}) end -- cgit v1.3.1 From 28b3092fdd8bd5cf16c4838a201ad5a0acb85a2e Mon Sep 17 00:00:00 2001 From: ruki Date: Tue, 27 Apr 2021 23:07:05 +0800 Subject: fix register packages --- xmake/modules/private/action/require/impl/register_packages.lua | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'xmake/modules') diff --git a/xmake/modules/private/action/require/impl/register_packages.lua b/xmake/modules/private/action/require/impl/register_packages.lua index 630ae89fe..4c326e770 100644 --- a/xmake/modules/private/action/require/impl/register_packages.lua +++ b/xmake/modules/private/action/require/impl/register_packages.lua @@ -94,7 +94,9 @@ function _register_required_package(instance, required_package) for idx, _ in ipairs(linkdeps) do local dep = linkdeps[total + 1 - idx] if dep then - _register_required_package_libs(dep, required_package, true) + if instance:is_library() then + _register_required_package_libs(dep, required_package, true) + end end end end -- cgit v1.3.1 From 9f44201bbc86bde6e78fcf742ac0ec779cc3d3d0 Mon Sep 17 00:00:00 2001 From: ruki Date: Tue, 27 Apr 2021 23:35:34 +0800 Subject: fix ml --- xmake/modules/core/tools/ml.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'xmake/modules') diff --git a/xmake/modules/core/tools/ml.lua b/xmake/modules/core/tools/ml.lua index a90cade20..83da11fb6 100644 --- a/xmake/modules/core/tools/ml.lua +++ b/xmake/modules/core/tools/ml.lua @@ -87,7 +87,7 @@ end -- make the includedir flag function nf_includedir(self, dir) - return {"-I", dir} + return {"-I" .. dir} end -- make the sysincludedir flag -- cgit v1.3.1