summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorruki <[email protected]>2023-07-24 23:50:03 +0800
committerruki <[email protected]>2023-07-24 23:50:03 +0800
commit4ba418e3031333b02864f2be081954ddf02fc7c8 (patch)
tree81ec6bb46fc1bb3c80b3fd11556b5fd04c205f7f
parent1d6cfd67ebb44f908edaf562dfa45747186a92f7 (diff)
support add_requires xmake::xxx packages
-rw-r--r--xmake/modules/private/action/require/impl/package.lua8
1 files changed, 8 insertions, 0 deletions
diff --git a/xmake/modules/private/action/require/impl/package.lua b/xmake/modules/private/action/require/impl/package.lua
index 6f5cc75d2..97cf00354 100644
--- a/xmake/modules/private/action/require/impl/package.lua
+++ b/xmake/modules/private/action/require/impl/package.lua
@@ -173,6 +173,13 @@ function _load_require(require_str, requires_extra, parentinfo)
end
end
+ -- we always use xmake package, `add_requires("xmake::zlib")`,
+ -- it is equivalent to `add_requires("zlib", {system = false})`
+ if packagename:startswith("xmake::") then
+ packagename = packagename:sub(8)
+ require_extra.system = false
+ end
+
-- init required item
local required = {}
parentinfo = parentinfo or {}
@@ -726,6 +733,7 @@ end
-- load required packages
function _load_package(packagename, requireinfo, opt)
+ print(packagename, requireinfo)
-- check circular dependency
opt = opt or {}