improve os.match

4 files changed, 8 insertions, 8 deletions

diff --git a/xmake/modules/detect/sdks/find_cuda.lua b/xmake/modules/detect/sdks/find_cuda.lua
index 16e66107f..1e657ddc1 100644
--- a/xmake/modules/detect/sdks/find_cuda.lua
+++ b/xmake/modules/detect/sdks/find_cuda.lua
@@ -31,11 +31,11 @@ function _find_cudadir()
     -- init the search directories
     local pathes = {}
     if os.host() == "macosx" then
-        table.insert(pathes, "/Developer/NVIDIA/CUDA**/bin")
+        table.insert(pathes, "/Developer/NVIDIA/CUDA*/bin")
     elseif os.host() == "windows" then
         table.insert(pathes, "$(env CUDA_PATH)/bin")
     else
-        table.insert(pathes, "/usr/local/cuda**/bin")
+        table.insert(pathes, "/usr/local/cuda*/bin")
     end
 
     -- attempt to find nvcc
diff --git a/xmake/modules/detect/sdks/find_ndk.lua b/xmake/modules/detect/sdks/find_ndk.lua
index 235466661..dfbc7454a 100644
--- a/xmake/modules/detect/sdks/find_ndk.lua
+++ b/xmake/modules/detect/sdks/find_ndk.lua
@@ -61,7 +61,7 @@ function main(ndkdir, opt)
 
     -- save the toolchains directory
     local toolchains = {}
-    for _, bindir in ipairs(os.dirs(path.join(ndkdir, "toolchains", cross .. "**", "prebuilt/*/bin"))) do
+    for _, bindir in ipairs(os.dirs(path.join(ndkdir, "toolchains", cross .. "*", "prebuilt/*/bin"))) do
         local binfiles = os.files(path.join(bindir, cross .. "*"))
         if binfiles and #binfiles > 0 then
             table.insert(toolchains, {bin = bindir, cross = cross})
diff --git a/xmake/modules/detect/sdks/find_qt.lua b/xmake/modules/detect/sdks/find_qt.lua
index 8c4b02ee0..655b0a6e0 100644
--- a/xmake/modules/detect/sdks/find_qt.lua
+++ b/xmake/modules/detect/sdks/find_qt.lua
@@ -33,7 +33,7 @@ import("core.project.config")
 function _find_sdkdir(sdkdir, sdkver)
 
     -- init sub-directory
-    local subdir = sdkver or "**"
+    local subdir = sdkver or "*"
 
     -- append target sub-directory
     local targetdir = nil
@@ -56,7 +56,7 @@ function _find_sdkdir(sdkdir, sdkver)
     if targetdir then
         subdir = path.join(subdir, targetdir)
     else
-        subdir = path.join(subdir, "**")
+        subdir = path.join(subdir, "*")
     end
     subdir = path.join(subdir, "bin")
 
diff --git a/xmake/modules/detect/sdks/find_wdk.lua b/xmake/modules/detect/sdks/find_wdk.lua
index dae209737..327099be3 100644
--- a/xmake/modules/detect/sdks/find_wdk.lua
+++ b/xmake/modules/detect/sdks/find_wdk.lua
@@ -48,7 +48,7 @@ function _find_umdfver(libdir, includedir)
 
     -- find versions
     local versions = {}
-    for _, p in ipairs(os.files(path.join(includedir, "wdf", "umdf", "**", "wdf.h"))) do
+    for _, p in ipairs(os.files(path.join(includedir, "wdf", "umdf", "*", "wdf.h"))) do
         table.insert(versions, path.filename(path.directory(p)))
     end
 
@@ -68,7 +68,7 @@ function _find_kmdfver(libdir, includedir)
 
     -- find versions
     local versions = {}
-    for _, p in ipairs(os.files(path.join(includedir, "wdf", "kmdf", "**", "wdf.h"))) do
+    for _, p in ipairs(os.files(path.join(includedir, "wdf", "kmdf", "*", "wdf.h"))) do
         table.insert(versions, path.filename(path.directory(p)))
     end
 
@@ -95,7 +95,7 @@ function _find_wdk(sdkdir, sdkver)
     -- get sdk version
     if not sdkver then
         local vers = {}
-        for _, dir in ipairs(os.dirs(path.join(sdkdir, "Include", "**", "km"))) do
+        for _, dir in ipairs(os.dirs(path.join(sdkdir, "Include", "*", "km"))) do
             table.insert(vers, path.filename(path.directory(dir)))
         end
         for _, ver in ipairs(vers) do