From ef61b0b1808551f90ab7b6d09d91c97bcfeb24d0 Mon Sep 17 00:00:00 2001
From: ruki <waruqi@gmail.com>
Date: Sun, 27 Jan 2019 22:29:24 +0800
Subject: do install conan files

---
 .../package/manager/conan/install_package.lua      | 22 ++++++++++++++++------
 1 file changed, 16 insertions(+), 6 deletions(-)

diff --git a/xmake/modules/package/manager/conan/install_package.lua b/xmake/modules/package/manager/conan/install_package.lua
index ce24cda83..114dd6202 100644
--- a/xmake/modules/package/manager/conan/install_package.lua
+++ b/xmake/modules/package/manager/conan/install_package.lua
@@ -35,11 +35,8 @@ end
 -- generate conanfile.txt
 function _generate_conanfile(name, opt)
 
-    -- get conanfile.txt
-    local conanfile = path.join(_get_build_directory(name), "conanfile.txt")
-
     -- trace
-    dprint("generate %s ..", conanfile)
+    dprint("generate conanfile.txt ..")
 
     -- get conan options and imports
     local options        = table.wrap(opt.options)
@@ -47,7 +44,7 @@ function _generate_conanfile(name, opt)
     local build_requires = table.wrap(opt.build_requires)
 
     -- generate it
-    io.writefile(conanfile, ([[
+    io.writefile("conanfile.txt", ([[
 [generators]
 xmake
 [requires]
@@ -76,9 +73,22 @@ function main(name, opt)
         return false
     end
 
+    -- get build directory
+    local buildir = _get_build_directory(name)
+
+    -- enter build directory
+    local oldir = os.cd(buildir)
+
     -- generate conanfile.txt
     _generate_conanfile(name, opt)
 
+    -- install package
+    local argv = {"install", "."}
+    os.vrunv(conan.program, argv)
+
+    -- leave build directory
+    os.cd(oldir)
+
     -- ok
---    return true
+    return true
 end
-- 
cgit v1.3.1