diff options
| author | ruki <[email protected]> | 2021-05-21 23:12:05 +0800 |
|---|---|---|
| committer | ruki <[email protected]> | 2021-05-21 23:12:05 +0800 |
| commit | b12276b9fe5b350c0db0a72c06259720306c7e2f (patch) | |
| tree | 67fd8f2e972ccf536fa93f393f1a6ea7555b06b7 | |
| parent | f1c8144ef2a1461defedfedea4ed331eba5dc5e6 (diff) | |
update changelog
| -rw-r--r-- | CHANGELOG.md | 2 | ||||
| -rw-r--r-- | xmake/modules/package/manager/vcpkg/search_package.lua | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index b563b6447..cfc701ad3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,7 @@ ### New features * [#1421](https://github.com/xmake-io/xmake/issues/1421): Add prefix, suffix and extension options for target names +* [#1422](https://github.com/xmake-io/xmake/issues/1422): Support search packages from vcpkg ### Bugs fixed @@ -1003,6 +1004,7 @@ ### 新特性 * [#1421](https://github.com/xmake-io/xmake/issues/1421): 针对 target 目标，增加目标文件名的前缀，后缀和扩展名设置接口。 +* [#1422](https://github.com/xmake-io/xmake/issues/1422): 支持从 vcpkg 中搜索包 ### Bugs 修复 diff --git a/xmake/modules/package/manager/vcpkg/search_package.lua b/xmake/modules/package/manager/vcpkg/search_package.lua index 09bf65eef..3073e2cd3 100644 --- a/xmake/modules/package/manager/vcpkg/search_package.lua +++ b/xmake/modules/package/manager/vcpkg/search_package.lua @@ -50,7 +50,7 @@ function main(name) end end if packagename:find(name) and not packagename:find('%[.*' .. name .. '.*%]') then - table.insert(results, {name = packagename, version = version, description = description}) + table.insert(results, {name = "vcpkg::" .. packagename, version = version, description = description}) end end return results |