Skip to content

Commit

Permalink
fix policy conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
waruqi committed Dec 3, 2024
1 parent ac7a4a5 commit 5823e89
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions xmake/core/project/policy.lua
Original file line number Diff line number Diff line change
Expand Up @@ -136,15 +136,15 @@ 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"},
-- It will force cmake package use ninja for build
["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
Expand Down

0 comments on commit 5823e89

Please sign in to comment.