diff options
| author | ruki <[email protected]> | 2024-11-30 23:05:41 +0800 |
|---|---|---|
| committer | ruki <[email protected]> | 2024-11-30 23:05:41 +0800 |
| commit | ce6f7dbd1350ba83c88c55b7ca170ae97bc54764 (patch) | |
| tree | 1450a48595534755481c7cf63a38a855c57cc0c0 | |
| parent | 2f1213a70b2ea1be2097c7f2bd7b4fc85a861b80 (diff) | |
improve tips
| -rw-r--r-- | tests/projects/package/compatibility/deps_with_version/xmake.lua | 6 | ||||
| -rw-r--r-- | xmake/modules/private/action/require/impl/package.lua | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/tests/projects/package/compatibility/deps_with_version/xmake.lua b/tests/projects/package/compatibility/deps_with_version/xmake.lua index 28adf5e7e..1ceb5f3a1 100644 --- a/tests/projects/package/compatibility/deps_with_version/xmake.lua +++ b/tests/projects/package/compatibility/deps_with_version/xmake.lua @@ -6,13 +6,15 @@ package_end() package("bar") add_deps("zlib 1.2.x") - set_policy("package.install_locally", true) -- add_deps("libpng dev") +-- add_deps("libpng", {configs = {debug = true}}) + set_policy("package.install_locally", true) on_install(function () end) package_end() package("zoo") - add_deps("libpng master") +-- add_deps("libpng master") +-- add_deps("libpng", {configs = {shared = true}}) set_policy("package.install_locally", true) on_install(function () end) package_end() diff --git a/xmake/modules/private/action/require/impl/package.lua b/xmake/modules/private/action/require/impl/package.lua index 19b05f51d..100a24560 100644 --- a/xmake/modules/private/action/require/impl/package.lua +++ b/xmake/modules/private/action/require/impl/package.lua @@ -1292,7 +1292,7 @@ function _check_and_resolve_package_depconflicts_impl(package, name, deps, resol cprint(" ${color.warning}->${clear} %s %s ${dim}%s", dep:displayname(), dep:version_str() or "", get_configs_str(dep)) end - print("we can use add_requireconfs(\"**.%s\", {override = true, configs = {version = \"x.x.x\"}}) to override version.", name) + print("we can use add_requireconfs(\"**.%s\", {override = true, version = \"x.x.x\"}) to override version.", name) raise("package(%s): conflict version dependencies!", name) end |