summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorruki <[email protected]>2020-11-11 23:59:24 +0800
committerruki <[email protected]>2020-11-11 23:59:24 +0800
commit5a2a13d3561dd31c324a556af577cadb35463d87 (patch)
tree2984ddc02d7e41a89c1b31ef76cc9935cebdf818
parentfc26a75e9566e93c70d9d0bd0340f60d266f5dbd (diff)
update readme
-rw-r--r--CHANGELOG.md2
-rw-r--r--README.md11
-rw-r--r--README_zh.md11
3 files changed, 24 insertions, 0 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 03b73c15b..ac7582e1c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,6 +10,7 @@
* [#1009](https://github.com/xmake-io/xmake/issues/1009): Support select and install any version package, e.g. `add_requires("libcurl 7.73.0", {verify = false})`
* [#1016](https://github.com/xmake-io/xmake/issues/1016): Add license checking for target/packages
* [#1017](https://github.com/xmake-io/xmake/issues/1017): Support external/system include directories `add_sysincludedirs` for package and toolchains
+* [#1020](https://github.com/xmake-io/xmake/issues/1020): Support to find and install pacman package on archlinux and msys2
### Change
@@ -866,6 +867,7 @@
* [#1009](https://github.com/xmake-io/xmake/issues/1009): 支持忽略校验去安装任意版本的包,`add_requires("libcurl 7.73.0", {verify = false})`
* [#1016](https://github.com/xmake-io/xmake/issues/1016): 针对依赖包增加license兼容性检测
* [#1017](https://github.com/xmake-io/xmake/issues/1017): 支持外部/系统头文件支持 `add_sysincludedirs`,依赖包默认使用`-isystem`
+* [#1020](https://github.com/xmake-io/xmake/issues/1020): 支持在 archlinux 和 msys2 上查找安装 pacman 包
### 改进
diff --git a/README.md b/README.md
index 0f3646f4a..c7839535c 100644
--- a/README.md
+++ b/README.md
@@ -157,6 +157,17 @@ The test project: [xmake-core](https://github.com/xmake-io/xmake/tree/master/cor
<img src="https://xmake.io/assets/img/index/package_arch.png" width="650px" />
+### Supported package repositories
+
+* Official Package Repository [xmake-repo](https://github.com/xmake-io/xmake-repo)
+* Official Package Manager [Xrepo](https://github.com/xmake-io/xrepo)
+* User-built repositories
+* Conan (conan::openssl/1.1.1g)
+* Vcpkg (vcpkg:ffmpeg)
+* Homebrew/Linuxbrew (brew::pcre2/libpcre2-8)
+* Pacman on archlinux/msys2 (pacman::libcurl)
+* Clib (clib::clibs/[email protected])
+
## Supported platforms
* Windows (x86, x64)
diff --git a/README_zh.md b/README_zh.md
index bcaae0fe3..decc74226 100644
--- a/README_zh.md
+++ b/README_zh.md
@@ -166,6 +166,17 @@ $ xmake f --menu
<img src="https://xmake.io/assets/img/index/package_arch.png" width="650px" />
+### 支持的包管理仓库
+
+* 官方自建仓库 [xmake-repo](https://github.com/xmake-io/xmake-repo) (tbox >1.6.1)
+* 官方包管理器 [Xrepo](https://github.com/xmake-io/xrepo)
+* 用户自建仓库
+* Conan (conan::openssl/1.1.1g)
+* Vcpkg (vcpkg:ffmpeg)
+* Homebrew/Linuxbrew (brew::pcre2/libpcre2-8)
+* Pacman on archlinux/msys2 (pacman::libcurl)
+* Clib (clib::clibs/[email protected])
+
## 支持平台
* Windows (x86, x64)