From cf9bec1a07d451784df68b2bb55fc041ca1ad33d Mon Sep 17 00:00:00 2001 From: ruki Date: Sat, 5 Sep 2020 00:53:38 +0800 Subject: improve trybuild/cmake to support android --- xmake/modules/private/action/trybuild/cmake.lua | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) (limited to 'xmake/modules/private') diff --git a/xmake/modules/private/action/trybuild/cmake.lua b/xmake/modules/private/action/trybuild/cmake.lua index 684941c39..5ec6a6506 100644 --- a/xmake/modules/private/action/trybuild/cmake.lua +++ b/xmake/modules/private/action/trybuild/cmake.lua @@ -44,6 +44,24 @@ function _get_configs(artifacts_dir) if is_plat("windows") and is_arch("x64") then table.insert(configs, "-A") table.insert(configs, "x64") + elseif is_plat("android") then + -- https://developer.android.google.cn/ndk/guides/cmake + local ndk = config.get("ndk") + if ndk and os.isdir(ndk) then + local arch = config.arch() + local ndk_sdkver = config.get("ndk_sdkver") + local ndk_cxxstl = config.get("ndk_cxxstl") + table.insert(configs, "-DCMAKE_TOOLCHAIN_FILE=" .. path.join(ndk, "build/cmake/android.toolchain.cmake")) + if arch then + table.insert(configs, "-DANDROID_ABI=" .. arch) + end + if ndk_sdkver then + table.insert(configs, "-DANDROID_NATIVE_API_LEVEL=" .. ndk_sdkver) + end + if ndk_cxxstl then + table.insert(configs, "-DANDROID_STL=" .. ndk_cxxstl) + end + end end -- enable verbose? @@ -91,9 +109,6 @@ end -- do build function build() - -- only support the current subsystem host platform now! - assert(is_subhost(config.plat()), "cmake: %s not supported!", config.plat()) - -- get artifacts directory local artifacts_dir = _get_artifacts_dir() if not os.isdir(artifacts_dir) then -- cgit v1.3.1