summaryrefslogtreecommitdiff
path: root/xmake/modules/package/manager/find_package.lua
diff options
context:
space:
mode:
authorruki <[email protected]>2019-01-25 00:00:10 +0800
committerruki <[email protected]>2019-01-24 18:01:01 +0800
commitfc20a39a1a046630864ff21d8156dc1e1ca99fb3 (patch)
tree2d8d34873c4d31593b870f095122bf19933f28ee /xmake/modules/package/manager/find_package.lua
parentcd683e80b5a6fc2159a97c3cde83bf824ad7294c (diff)
add conan install package
Diffstat (limited to 'xmake/modules/package/manager/find_package.lua')
-rw-r--r--xmake/modules/package/manager/find_package.lua2
1 files changed, 1 insertions, 1 deletions
diff --git a/xmake/modules/package/manager/find_package.lua b/xmake/modules/package/manager/find_package.lua
index 252a33e87..7fec292e5 100644
--- a/xmake/modules/package/manager/find_package.lua
+++ b/xmake/modules/package/manager/find_package.lua
@@ -54,7 +54,7 @@ function _find_package_with_builtin_rule(package_name, opt)
table.insert(managers, "vcpkg")
-- find it from conan (support multi-platforms/architectures)
--- table.insert(managers, "conan")
+ table.insert(managers, "conan")
-- only support the current host platform and architecture
if opt.plat == os.host() and opt.arch == os.arch() and (opt.mode == nil or opt.mode == "release") then