From 2743cb2ee2b2640bbb22aa39d63c134563949a05 Mon Sep 17 00:00:00 2001 From: ruki Date: Thu, 1 Jun 2017 11:23:19 +0800 Subject: improve find program, file and path modules --- xmake/modules/detect/tool/find_vsjitdebugger.lua | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'xmake/modules/detect/tool/find_vsjitdebugger.lua') diff --git a/xmake/modules/detect/tool/find_vsjitdebugger.lua b/xmake/modules/detect/tool/find_vsjitdebugger.lua index 922d3fdf3..879fd0a5d 100644 --- a/xmake/modules/detect/tool/find_vsjitdebugger.lua +++ b/xmake/modules/detect/tool/find_vsjitdebugger.lua @@ -51,7 +51,10 @@ function main(opt) opt = opt or {} -- find program - return find_program(opt.program or "vsjitdebugger", {"$(reg HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\AeDebug;Debugger)", - "$(reg HKEY_LOCAL_MACHINE\\SOFTWARE\\Wow6432Node\\Microsoft\\Windows NT\\CurrentVersion\\AeDebug;Debugger)"} + 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) end -- cgit v1.3.1