summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorruki <[email protected]>2021-03-18 23:48:41 +0800
committerruki <[email protected]>2021-03-18 23:48:41 +0800
commit7adbba0c3b57e0a58eaf00b8ab21db5bcffdf1fc (patch)
treee048cddb41ea3111f85500acec4b753675b83db0
parent7852d9f59e26ea7a357a4c9434bbfbb32729094a (diff)
fix require version
-rw-r--r--xmake/modules/private/action/require/impl/package.lua3
1 files changed, 2 insertions, 1 deletions
diff --git a/xmake/modules/private/action/require/impl/package.lua b/xmake/modules/private/action/require/impl/package.lua
index c70a933cc..cc6d43afd 100644
--- a/xmake/modules/private/action/require/impl/package.lua
+++ b/xmake/modules/private/action/require/impl/package.lua
@@ -43,6 +43,7 @@ end
--
-- semver
-- - add_requires("tbox >=1.5.1", "zlib >=1.2.11")
+-- - add_requires("tbox", {version = ">=1.5.1"})
--
-- git branch/tag
-- - add_requires("zlib master")
@@ -149,7 +150,7 @@ function _parse_require(require_str, requires_extra, parentinfo)
{
originstr = require_str,
reponame = reponame,
- version = version,
+ version = require_extra.version or version,
plat = require_extra.plat, -- require package in the given platform
arch = require_extra.arch, -- require package in the given architecture
targetos = require_extra.targetos, -- require package in the given target os