diff options
| author | ruki <[email protected]> | 2018-10-10 23:34:01 +0800 |
|---|---|---|
| committer | ruki <[email protected]> | 2018-10-10 15:24:11 +0800 |
| commit | 65f9d3c587300983795c6d744ac847779473fd3b (patch) | |
| tree | 42da068df5c20f50b7b2bbf0c3fb68d27dcd00f6 | |
| parent | 3a0638eb9411258a790d6735f677e12018a6d43d (diff) | |
fix cmake for x64
| -rw-r--r-- | xmake/actions/build/trybuild.lua | 2 | ||||
| -rw-r--r-- | xmake/modules/package/tools/cmake.lua | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/xmake/actions/build/trybuild.lua b/xmake/actions/build/trybuild.lua index 1776910e8..526428496 100644 --- a/xmake/actions/build/trybuild.lua +++ b/xmake/actions/build/trybuild.lua @@ -46,7 +46,7 @@ end function _build_for_cmakelists(buildfile) os.mkdir("build") os.cd("build") - os.vrun("cmake -a %s -DCMAKE_INSTALL_PREFIX=\"%s\" ..", os.arch(), path.absolute("install")) + os.vrun("cmake -A %s -DCMAKE_INSTALL_PREFIX=\"%s\" ..", os.arch(), path.absolute("install")) if is_host("windows") then local slnfile = assert(find_file("*.sln", os.curdir()), "*.sln file not found!") diff --git a/xmake/modules/package/tools/cmake.lua b/xmake/modules/package/tools/cmake.lua index a4c94bc33..0eeef1bfc 100644 --- a/xmake/modules/package/tools/cmake.lua +++ b/xmake/modules/package/tools/cmake.lua @@ -30,7 +30,7 @@ import("lib.detect.find_file") function install(package, configs) os.mkdir("build/install") local oldir = os.cd("build") - os.vrun("cmake -a $(arch) -DCMAKE_INSTALL_PREFIX=\"%s\" ..", path.absolute("install")) + os.vrun("cmake -A $(arch) -DCMAKE_INSTALL_PREFIX=\"%s\" ..", path.absolute("install")) if is_host("windows") then local slnfile = assert(find_file("*.sln", os.curdir()), "*.sln file not found!") os.vrun("msbuild \"%s\" -nologo -t:Rebuild -p:Configuration=%s -p:Platform=%s", slnfile, package:debug() and "Debug" or "Release", is_arch("x64") and "x64" or "Win32") |
