summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorruki <[email protected]>2019-01-29 00:42:21 +0800
committerruki <[email protected]>2019-01-28 22:14:10 +0800
commit25d080557a3667ebd49015728bfe860585be0ed8 (patch)
tree4fe09020548b7bed830f494ad929a5ccd1139ba2
parent93c79d79a4ba9febfd231a28632f7a6b8b46e84b (diff)
add --build args for conan/install_package
-rw-r--r--xmake/modules/package/manager/conan/install_package.lua9
1 files changed, 8 insertions, 1 deletions
diff --git a/xmake/modules/package/manager/conan/install_package.lua b/xmake/modules/package/manager/conan/install_package.lua
index 5e609e7d0..d1db99998 100644
--- a/xmake/modules/package/manager/conan/install_package.lua
+++ b/xmake/modules/package/manager/conan/install_package.lua
@@ -61,7 +61,7 @@ end
-- install package
--
-- @param name the package name, e.g. conan::OpenSSL/1.0.2n@conan/stable
--- @param opt the options, .e.g {verbose = true, mode = "release", plat = , arch = , options = {}, imports = {}}
+-- @param opt the options, .e.g {verbose = true, mode = "release", plat = , arch = , build = "all", options = {}, imports = {}, build_requires = {}}
--
-- @return true or false
--
@@ -90,6 +90,13 @@ function main(name, opt)
-- install package
local argv = {"install", "."}
+ if opt.build then
+ if opt.build == "all" then
+ table.insert(argv, "--build")
+ else
+ table.insert(argv, "--build=" .. opt.build)
+ end
+ end
os.vrunv(conan.program, argv)
-- leave build directory