summaryrefslogtreecommitdiff
path: root/xmake/modules/detect/tools/find_python.lua
diff options
context:
space:
mode:
authorruki <[email protected]>2018-09-22 08:44:35 +0800
committerruki <[email protected]>2018-09-22 08:44:35 +0800
commit6935be8876c358d89b5c5c2d5c0a56f4ea9d1590 (patch)
tree234c1e6a32b2da58b231279bb3bfc33d01f3d262 /xmake/modules/detect/tools/find_python.lua
parent180e96c3759ab7e80e18d3ab445945d8c758e01a (diff)
add find_python2
Diffstat (limited to 'xmake/modules/detect/tools/find_python.lua')
-rw-r--r--xmake/modules/detect/tools/find_python.lua7
1 files changed, 6 insertions, 1 deletions
diff --git a/xmake/modules/detect/tools/find_python.lua b/xmake/modules/detect/tools/find_python.lua
index cc2645a6f..d4097e4c9 100644
--- a/xmake/modules/detect/tools/find_python.lua
+++ b/xmake/modules/detect/tools/find_python.lua
@@ -25,6 +25,8 @@
-- imports
import("lib.detect.find_program")
import("lib.detect.find_programver")
+import("detect.tools.find_python2")
+import("detect.tools.find_python3")
-- find python
--
@@ -46,10 +48,13 @@ function main(opt)
-- find program
local program = find_program(opt.program or "python", opt)
+ if not program then
+ program = find_python3() or find_python2()
+ end
-- find program version
local version = nil
- if program and opt and opt.version then
+ if program and opt.version then
opt.command = function ()
local outs, errs = os.iorunv(program, {"--version"})
return ((outs or "") .. (errs or "")):trim()