From 32e5e809ec5451cb0265ac2c6f6f44766734c573 Mon Sep 17 00:00:00 2001 From: ruki Date: Sat, 28 Nov 2020 19:41:45 +0800 Subject: improve cmake tools --- xmake/modules/package/tools/cmake.lua | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/xmake/modules/package/tools/cmake.lua b/xmake/modules/package/tools/cmake.lua index c6d8a29c9..6787f6ac4 100644 --- a/xmake/modules/package/tools/cmake.lua +++ b/xmake/modules/package/tools/cmake.lua @@ -567,10 +567,10 @@ function build(package, configs, opt) table.insert(argv, "--" .. name .. "=" .. value) end end - table.insert(argv, opt.sourcedir or '..') + table.insert(argv, oldir) -- do configure - os.vrunv("cmake", argv, {envs = :opt.envs or buildenvs(package, opt)}) + os.vrunv("cmake", argv, {envs = opt.envs or buildenvs(package, opt)}) -- do build local cmake_generator = opt.cmake_generator @@ -625,7 +625,7 @@ function install(package, configs, opt) table.insert(argv, "--" .. name .. "=" .. value) end end - table.insert(argv, opt.sourcedir or '..') + table.insert(argv, oldir) -- generate build file os.vrunv("cmake", argv, {envs = opt.envs or buildenvs(package, opt)}) -- cgit v1.3.1