rename xcode dir config

9 files changed, 16 insertions, 16 deletions

diff --git a/xmake/actions/require/action/build.lua b/xmake/actions/require/action/build.lua
index 01ecafe32..52b71aed4 100644
--- a/xmake/actions/require/action/build.lua
+++ b/xmake/actions/require/action/build.lua
@@ -47,8 +47,8 @@ function _build_for_xmakefile(package, buildfile)
         linux    = {"sdk", "cross", "toolchains"},
         cross    = {"sdk", "cross", "toolchains"},
         mingw    = {"sdk", "cross", "toolchains"},
-        macosx   = {"xcode_dir", "xcode_sdkver"},
-        iphoneos = {"xcode_dir", "xcode_sdkver"},
+        macosx   = {"xcode", "xcode_sdkver"},
+        iphoneos = {"xcode", "xcode_sdkver"},
         windows  = {"vs"}
     }
 
diff --git a/xmake/modules/detect/sdks/find_qt.lua b/xmake/modules/detect/sdks/find_qt.lua
index 93a524ca0..21c638eae 100644
--- a/xmake/modules/detect/sdks/find_qt.lua
+++ b/xmake/modules/detect/sdks/find_qt.lua
@@ -126,7 +126,7 @@ function main(sdkdir, opt)
     if qt then
 
         -- save to config
-        config.set("qt_dir", qt.sdkdir, {force = true, readonly = true})
+        config.set("qt", qt.sdkdir, {force = true, readonly = true})
         config.set("qt_sdkver", qt.sdkver, {force = true, readonly = true})
 
         -- trace
diff --git a/xmake/platforms/checker.lua b/xmake/platforms/checker.lua
index 61dd6fbf1..46b45b582 100644
--- a/xmake/platforms/checker.lua
+++ b/xmake/platforms/checker.lua
@@ -120,7 +120,7 @@ end
 function check_xcode(config, optional)
 
     -- get the xcode directory
-    local xcode_dir = config.get("xcode_dir")
+    local xcode_dir = config.get("xcode")
     if not xcode_dir then
 
         -- check ok? update it
@@ -128,7 +128,7 @@ function check_xcode(config, optional)
         if xcode_dir then
 
             -- save it
-            config.set("xcode_dir", xcode_dir)
+            config.set("xcode", xcode_dir)
 
             -- trace
             cprint("checking for the Xcode application directory ... ${green}%s", xcode_dir)
@@ -153,7 +153,7 @@ function check_xcode_sdkver(config, optional)
     if not xcode_sdkver then
 
         -- check ok? update it
-        xcode_sdkver = find_xcode_sdkvers({xcode_dir = config.get("xcode_dir"), plat = config.get("plat"), arch = config.get("arch")})[1]
+        xcode_sdkver = find_xcode_sdkvers({xcode_dir = config.get("xcode"), plat = config.get("plat"), arch = config.get("arch")})[1]
         if xcode_sdkver then
             
             -- save it
@@ -192,7 +192,7 @@ function check_cuda(config)
         if toolchains then
 
             -- save it
-            config.set("cuda_dir", toolchains.cudadir)
+            config.set("cuda", toolchains.cudadir)
 
             -- trace
             cprint("checking for the Cuda SDK directory ... ${green}%s", toolchains.cudadir)
diff --git a/xmake/platforms/iphoneos/load.lua b/xmake/platforms/iphoneos/load.lua
index 0ca8c4b8d..91a715d7f 100644
--- a/xmake/platforms/iphoneos/load.lua
+++ b/xmake/platforms/iphoneos/load.lua
@@ -43,7 +43,7 @@ function main()
     local target_minver_flags = ifelse(simulator, "-mios-simulator-version-min=", "-miphoneos-version-min=") .. target_minver
 
     -- init the xcode sdk directory
-    local xcode_dir     = config.get("xcode_dir")
+    local xcode_dir     = config.get("xcode")
     local xcode_sdkver  = config.get("xcode_sdkver")
     local xcode_sdkdir  = format("%s/Contents/Developer/Platforms/%s.platform/Developer/SDKs/%s%s.sdk", xcode_dir, platname, platname, xcode_sdkver)
 
diff --git a/xmake/platforms/iphoneos/xmake.lua b/xmake/platforms/iphoneos/xmake.lua
index 05ee387db..4ac3afd42 100644
--- a/xmake/platforms/iphoneos/xmake.lua
+++ b/xmake/platforms/iphoneos/xmake.lua
@@ -48,7 +48,7 @@ platform("iphoneos")
                 config = 
                 {   
                     {category = "XCode SDK Configuration"                                           }
-                ,   {nil, "xcode_dir",      "kv", "auto",       "The Xcode Application Directory"   }
+                ,   {nil, "xcode",          "kv", "auto",       "The Xcode Application Directory"   }
                 ,   {nil, "xcode_sdkver",   "kv", "auto",       "The SDK Version for Xcode"         }
                 ,   {nil, "target_minver",  "kv", "auto",       "The Target Minimal Version"        }
                 ,   {}
@@ -60,7 +60,7 @@ platform("iphoneos")
             ,   global = 
                 {   
                     {}
-                ,   {nil, "xcode_dir",      "kv", "auto",       "The Xcode Application Directory"   }
+                ,   {nil, "xcode",          "kv", "auto",       "The Xcode Application Directory"   }
                 ,   {}
                 ,   {nil, "mobileprovision","kv", "auto",       "The Provisioning Profile File"     }
                 ,   {nil, "codesign",       "kv", "auto",       "The Code Signing Indentity"        }
diff --git a/xmake/platforms/macosx/load.lua b/xmake/platforms/macosx/load.lua
index 827889eb9..ecbf578cc 100644
--- a/xmake/platforms/macosx/load.lua
+++ b/xmake/platforms/macosx/load.lua
@@ -33,7 +33,7 @@ function main()
     local target_minver = config.get("target_minver")
 
     -- init flags for the xcode sdk directory
-    local xcode_dir     = config.get("xcode_dir")
+    local xcode_dir     = config.get("xcode")
     local xcode_sdkver  = config.get("xcode_sdkver")
     local xcode_sdkdir  = nil
     if xcode_dir and xcode_sdkver then
diff --git a/xmake/platforms/macosx/xmake.lua b/xmake/platforms/macosx/xmake.lua
index 1e10442be..7c6a897d8 100644
--- a/xmake/platforms/macosx/xmake.lua
+++ b/xmake/platforms/macosx/xmake.lua
@@ -51,7 +51,7 @@ platform("macosx")
                 config = 
                 {   
                     {category = "XCode SDK Configuration"                                           }
-                ,   {nil, "xcode_dir",      "kv", "auto",       "The Xcode Application Directory"   }
+                ,   {nil, "xcode",          "kv", "auto",       "The Xcode Application Directory"   }
                 ,   {nil, "xcode_sdkver",   "kv", "auto",       "The SDK Version for Xcode"         }
                 ,   {nil, "target_minver",  "kv", "auto",       "The Target Minimal Version"        }
                 ,   {category = "Cuda SDK Configuration"                                            }
@@ -64,7 +64,7 @@ platform("macosx")
             ,   global = 
                 {   
                     {}
-                ,   {nil, "xcode_dir",      "kv", "auto",       "The Xcode Application Directory"   }
+                ,   {nil, "xcode",          "kv", "auto",       "The Xcode Application Directory"   }
                 ,   {nil, "cuda",           "kv", "auto",       "The Cuda SDK Directory"            }
                 ,   {nil, "qt",             "kv", "auto",       "The Qt SDK Directory"              }
                 }
diff --git a/xmake/platforms/watchos/load.lua b/xmake/platforms/watchos/load.lua
index 0716da610..df84202c4 100644
--- a/xmake/platforms/watchos/load.lua
+++ b/xmake/platforms/watchos/load.lua
@@ -40,7 +40,7 @@ function main()
     local target_minver_flags = ifelse(simulator, "-mwatchos-simulator-version-min=", "-mwatchos-version-min=") .. target_minver
 
     -- init the xcode sdk directory
-    local xcode_dir     = config.get("xcode_dir")
+    local xcode_dir     = config.get("xcode")
     local xcode_sdkver  = config.get("xcode_sdkver")
     local xcode_sdkdir  = format("%s/Contents/Developer/Platforms/%s.platform/Developer/SDKs/%s%s.sdk", xcode_dir, platname, platname, xcode_sdkver)
 
diff --git a/xmake/platforms/watchos/xmake.lua b/xmake/platforms/watchos/xmake.lua
index 97df8f893..c94232ec4 100644
--- a/xmake/platforms/watchos/xmake.lua
+++ b/xmake/platforms/watchos/xmake.lua
@@ -48,7 +48,7 @@ platform("watchos")
                 config = 
                 {   
                     {category = "XCode SDK Configuration"                                         }
-                ,   {nil, "xcode_dir",      "kv", "auto",       "The Xcode Application Directory" }
+                ,   {nil, "xcode",          "kv", "auto",       "The Xcode Application Directory" }
                 ,   {nil, "xcode_sdkver",   "kv", "auto",       "The SDK Version for Xcode"       }
                 ,   {nil, "target_minver",  "kv", "auto",       "The Target Minimal Version"      }
                 ,   {                                                                             }
@@ -60,7 +60,7 @@ platform("watchos")
             ,   global = 
                 {   
                     {                                                                             }
-                ,   {nil, "xcode_dir",      "kv", "auto",       "The Xcode Application Directory" }
+                ,   {nil, "xcode",          "kv", "auto",       "The Xcode Application Directory" }
                 ,   {                                                                             }
                 ,   {nil, "mobileprovision","kv", "auto",       "The Provisioning Profile File"   }
                 ,   {nil, "codesign",       "kv", "auto",       "The Code Signing Indentity"      }