rename configurations to conf in conan package manager

2 files changed, 13 insertions, 13 deletions

diff --git a/xmake/modules/package/manager/conan/configurations.lua b/xmake/modules/package/manager/conan/configurations.lua
index fcc9b9c01..01cc8b34c 100644
--- a/xmake/modules/package/manager/conan/configurations.lua
+++ b/xmake/modules/package/manager/conan/configurations.lua
@@ -22,17 +22,17 @@
 function main()
     return
     {
-        build                   = {description = "Use it to choose if you want to build from sources.", default = "missing", values = {"all", "never", "missing", "outdated"}},
-        remote                  = {description = "Set the conan remote server."},
-        options                 = {description = "Set the options values, e.g. shared=True"},
-        settings                = {description = "Set the host settings for conan."},
-        settings_host           = {description = "Set the host settings for conan."},
-        settings_build          = {description = "Set the build settings for conan."},
-        imports                 = {description = "Set the imports for conan 1.x, it has been deprecated in conan 2.x."},
-        build_requires          = {description = "Set the build requires for conan."},
-        configurations          = {description = "Set the host configurations for conan, e.g. tools.microsoft.bash:subsystem=msys2"},
-        configurations_host     = {description = "Set the host configurations for conan, e.g. tools.microsoft.bash:subsystem=msys2"},
-        configurations_build    = {description = "Set the build configurations for conan, e.g. tools.microsoft.bash:subsystem=msys2"},
+        build           = {description = "Use it to choose if you want to build from sources.", default = "missing", values = {"all", "never", "missing", "outdated"}},
+        remote          = {description = "Set the conan remote server."},
+        options         = {description = "Set the options values, e.g. shared=True"},
+        settings        = {description = "Set the host settings for conan."},
+        settings_host   = {description = "Set the host settings for conan."},
+        settings_build  = {description = "Set the build settings for conan."},
+        imports         = {description = "Set the imports for conan 1.x, it has been deprecated in conan 2.x."},
+        build_requires  = {description = "Set the build requires for conan."},
+        conf            = {description = "Set the host configurations for conan, e.g. tools.microsoft.bash:subsystem=msys2"},
+        conf_host       = {description = "Set the host configurations for conan, e.g. tools.microsoft.bash:subsystem=msys2"},
+        conf_build      = {description = "Set the build configurations for conan, e.g. tools.microsoft.bash:subsystem=msys2"},
     }
 end
 
diff --git a/xmake/modules/package/manager/conan/v2/install_package.lua b/xmake/modules/package/manager/conan/v2/install_package.lua
index b424ee06f..f93ebaea7 100644
--- a/xmake/modules/package/manager/conan/v2/install_package.lua
+++ b/xmake/modules/package/manager/conan/v2/install_package.lua
@@ -334,13 +334,13 @@ function main(conan, name, opt)
     end
 
     -- set custom host configurations
-    for _, conf in ipairs(configs.configurations or configs.configurations_host) do
+    for _, conf in ipairs(configs.conf or configs.conf_host) do
         table.insert(argv, "-c")
         table.insert(argv, conf)
     end
 
     -- set custom build configurations
-    for _, conf in ipairs(configs.configurations_build) do
+    for _, conf in ipairs(configs.conf_build) do
         table.insert(argv, "-c:b")
         table.insert(argv, conf)
     end