modify find_program interface

1 files changed, 9 insertions, 8 deletions

diff --git a/xmake/modules/detect/tools/find_vsjitdebugger.lua b/xmake/modules/detect/tools/find_vsjitdebugger.lua
index 008a2b0b2..7ab985f0c 100644
--- a/xmake/modules/detect/tools/find_vsjitdebugger.lua
+++ b/xmake/modules/detect/tools/find_vsjitdebugger.lua
@@ -48,13 +48,14 @@ function main(opt)
     end
 
     -- init options
-    opt = opt or {}
-    
+    opt        = opt or {}
+    opt.pathes = opt.pathes or function ()
+        for _, reg in ipairs({"HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\AeDebug;Debugger", "HKEY_LOCAL_MACHINE\\SOFTWARE\\Wow6432Node\\Microsoft\\Windows NT\\CurrentVersion\\AeDebug;Debugger"}) do
+            return (val("reg " .. reg) or ""):match("\"(.-)\"")
+        end
+    end
+    opt.check  = opt.check or function (program) if not os.isfile(program) then raise() end end
+
     -- find program
-    return find_program(opt.program or "vsjitdebugger", {function () 
-                                                            for _, reg in ipairs({"HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\AeDebug;Debugger", "HKEY_LOCAL_MACHINE\\SOFTWARE\\Wow6432Node\\Microsoft\\Windows NT\\CurrentVersion\\AeDebug;Debugger"}) do
-                                                                return (val("reg " .. reg) or ""):match("\"(.-)\"")
-                                                            end
-                                                         end}
-                                                      , function (program) if not os.isfile(program) then raise() end end)
+    return find_program(opt.program or "vsjitdebugger", opt)
 end