summaryrefslogtreecommitdiff
path: root/xmake/modules/package/manager/conan/install_package.lua
diff options
context:
space:
mode:
authorruki <[email protected]>2019-01-29 22:43:59 +0800
committerruki <[email protected]>2019-01-29 10:23:56 +0800
commit0bfe3e42e041fb23bf15669c4c88931a4bc65c48 (patch)
treee827004c80e81fe725d331d79467e71152311d64 /xmake/modules/package/manager/conan/install_package.lua
parentf0efa9f471824ead88a98ca8cf3387c88606e051 (diff)
rename conan functions
Diffstat (limited to 'xmake/modules/package/manager/conan/install_package.lua')
-rw-r--r--xmake/modules/package/manager/conan/install_package.lua13
1 files changed, 7 insertions, 6 deletions
diff --git a/xmake/modules/package/manager/conan/install_package.lua b/xmake/modules/package/manager/conan/install_package.lua
index 3d7af9078..62ab744ef 100644
--- a/xmake/modules/package/manager/conan/install_package.lua
+++ b/xmake/modules/package/manager/conan/install_package.lua
@@ -28,17 +28,17 @@ import("core.project.config")
import("lib.detect.find_tool")
-- get build directory
-function _get_build_directory(name)
+function _conan_get_build_directory(name)
return path.absolute(path.join(config.buildir() or os.tmpdir(), ".conan", name))
end
-- generate conanfile.txt
-function _generate_conanfile(name, opt)
+function _conan_generate_conanfile(name, opt)
-- trace
- dprint("generate %s ..", path.join(_get_build_directory(name), "conanfile.txt"))
+ dprint("generate %s ..", path.join(_conan_get_build_directory(name), "conanfile.txt"))
- -- get conan options and imports
+ -- get conan options, imports and build_requires
local options = table.wrap(opt.options)
local imports = table.wrap(opt.imports)
local build_requires = table.wrap(opt.build_requires)
@@ -74,7 +74,7 @@ function main(name, opt)
end
-- get build directory
- local buildir = _get_build_directory(name)
+ local buildir = _conan_get_build_directory(name)
-- clean the build directory
os.tryrm(buildir)
@@ -86,8 +86,9 @@ function main(name, opt)
local oldir = os.cd(buildir)
-- generate conanfile.txt
- _generate_conanfile(name, opt)
+ _conan_generate_conanfile(name, opt)
+ -- TODO opt.mode, --remote=, --compiler=, ..
-- install package
local argv = {"install", "."}
if opt.build then