From 4ba418e3031333b02864f2be081954ddf02fc7c8 Mon Sep 17 00:00:00 2001 From: ruki Date: Mon, 24 Jul 2023 23:50:03 +0800 Subject: support add_requires xmake::xxx packages --- xmake/modules/private/action/require/impl/package.lua | 8 ++++++++ 1 file changed, 8 insertions(+) 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 {} -- cgit v1.3.1