diff options
| author | ruki <[email protected]> | 2024-12-03 23:48:03 +0800 |
|---|---|---|
| committer | ruki <[email protected]> | 2024-12-03 23:48:03 +0800 |
| commit | 5823e8911274de13645ad8fc11668c8c4478d7af (patch) | |
| tree | 8b3cbbb46d95159937dc9345ac9eba1a59e3b7c9 | |
| parent | ac7a4a527990ad2e0d2d034971ce7699818d8b61 (diff) | |
fix policy conflicts
| -rw-r--r-- | xmake/core/project/policy.lua | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/xmake/core/project/policy.lua b/xmake/core/project/policy.lua index af8fb20e4..0930b40fa 100644 --- a/xmake/core/project/policy.lua +++ b/xmake/core/project/policy.lua @@ -136,6 +136,8 @@ function policy.policies() -- if true, then any updates to library dependencies, such as buildhash changes due to version changes, -- will force the installed packages to be recompiled and installed. @see https://github.com/xmake-io/xmake/issues/2719 ["package.librarydeps.strict_compatibility"] = {description = "Set strict compatibility for package and it's all library dependencies.", type = "boolean"}, + -- Resolve package dependencies conflict automatically + ["package.resolve_depconflict"] = {description = "Automatically resolve package dependencies conflict.", default = true, type = "boolean"}, -- Automatically passes dependency configuration for inner xmake package -- https://github.com/xmake-io/xmake/issues/3952 ["package.xmake.pass_depconfs"] = {description = "Automatically passes dependency configuration for inner xmake package", default = true, type = "boolean"}, @@ -143,8 +145,6 @@ function policy.policies() ["package.cmake_generator.ninja"] = {description = "Set cmake package use ninja for build", type = "boolean"}, -- Enable msbuild MultiToolTask ["package.msbuild.multi_tool_task"] = {description = "Enable msbuild MultiToolTask.", default = false, type = "boolean"}, - -- Resolve package dependencies conflict automatically - ["package.resolve_depconflict"] = {description = "Automatically resolve package dependencies conflict.", default = true, type = "boolean"}, -- Stop to test on the first failure ["test.stop_on_first_failure"] = {description = "Stop to test on the first failure", default = false, type = "boolean"}, -- Return zero as exit code on failure |