diff options
| author | ruki <[email protected]> | 2020-11-28 19:41:45 +0800 |
|---|---|---|
| committer | ruki <[email protected]> | 2020-11-28 19:41:45 +0800 |
| commit | 32e5e809ec5451cb0265ac2c6f6f44766734c573 (patch) | |
| tree | 7ac5cfaac92128080505d998a6520fa68f5b4cdf | |
| parent | 8d86e51d1d62977fbb51a07b1fe43f728b23d9cb (diff) | |
improve cmake tools
| -rw-r--r-- | xmake/modules/package/tools/cmake.lua | 6 |
1 files 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)}) |
