diff options
| author | ruki <[email protected]> | 2023-05-15 23:34:26 +0800 |
|---|---|---|
| committer | ruki <[email protected]> | 2023-05-15 23:34:26 +0800 |
| commit | 591f26b2b0dc3f77441a7e13c2707ec69cc1cc00 (patch) | |
| tree | cce1419686c47a0435e1f3dc8a3ceb1ad1f37f33 | |
| parent | d18ff07ba05299e233494b0a86af56447e7b0039 (diff) | |
switch to conan 2.0.5
| -rw-r--r-- | CHANGELOG.md | 4 | ||||
| -rw-r--r-- | xmake/modules/package/manager/conan/install_package.lua | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index c456c6bb9..af0903242 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,7 +5,7 @@ ### New features * [#3613](https://github.com/xmake-io/xmake/issues/3613): Add `wasm.preloadfiles` configuration for wasm -* [#3703](https://github.com/xmake-io/xmake/pull/3703): Support for conan 2.0 +* [#3703](https://github.com/xmake-io/xmake/pull/3703): Support for conan >=2.0.5 ### Changes @@ -1580,7 +1580,7 @@ ### 新特性 * [#3613](https://github.com/xmake-io/xmake/issues/3613): 添加 `wasm.preloadfiles` 扩展配置 -* [#3703](https://github.com/xmake-io/xmake/pull/3703): 支持 conan 2.0 +* [#3703](https://github.com/xmake-io/xmake/pull/3703): 支持 conan >=2.0.5 ### 改进 diff --git a/xmake/modules/package/manager/conan/install_package.lua b/xmake/modules/package/manager/conan/install_package.lua index 48e9f132f..3352de744 100644 --- a/xmake/modules/package/manager/conan/install_package.lua +++ b/xmake/modules/package/manager/conan/install_package.lua @@ -36,7 +36,7 @@ function main(name, opt) if not conan then raise("conan not found!") end - if conan.version and semver.compare(conan.version, "2.0.4") >= 0 then -- TODO 2.0.5 + if conan.version and semver.compare(conan.version, "2.0.5") >= 0 then -- https://github.com/conan-io/conan/issues/13709 import("package.manager.conan.v2.install_package")(conan, name, opt) elseif conan.version and semver.compare(conan.version, "2.0.0") < 0 then |