pass config to conan package

2 files changed, 9 insertions, 6 deletions

diff --git a/xmake/modules/package/manager/conan/install_package.lua b/xmake/modules/package/manager/conan/install_package.lua
index ada3f110e..962c69fe5 100644
--- a/xmake/modules/package/manager/conan/install_package.lua
+++ b/xmake/modules/package/manager/conan/install_package.lua
@@ -42,8 +42,9 @@ function _generate_conanfile(name, opt)
     dprint("generate %s ..", conanfile)
 
     -- get conan options and imports
-    local conan_options = opt.conan_options or {}
-    local conan_imports = opt.conan_imports or {}
+    local conan_options = opt.options or {}
+    local conan_imports = opt.imports or {}
+    print(opt)
 
     -- generate it
     io.writefile(conanfile, ([[
@@ -63,7 +64,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, conan_options = {}, conan_imports = {}}
+-- @param opt   the options, .e.g {verbose = true, mode = "release", plat = , arch = , options = {}, imports = {}}
 --
 -- @return      true or false
 --
@@ -79,5 +80,5 @@ function main(name, opt)
     _generate_conanfile(name, opt)
 
     -- ok
-    return true
+--    return true
 end
diff --git a/xmake/modules/package/manager/install_package.lua b/xmake/modules/package/manager/install_package.lua
index 42f60d68f..845c10feb 100644
--- a/xmake/modules/package/manager/install_package.lua
+++ b/xmake/modules/package/manager/install_package.lua
@@ -50,7 +50,7 @@ function _install_package(manager_name, package_name, opt)
     for _, manager_name in ipairs(managers) do
         dprint("installing %s from %s ..", package_name, manager_name)
         if import("package.manager." .. manager_name .. ".install_package", {anonymous = true})(package_name, opt) then
-            break
+            return true
         end
     end
 end
@@ -83,5 +83,7 @@ function main(name, opt)
     opt.version = require_version or opt.version
 
     -- do install package
-    _install_package(manager_name, package_name, opt)
+    if not _install_package(manager_name, package_name, opt) then
+        raise("install %s failed!", name)
+    end
 end