diff options
| author | ruki <[email protected]> | 2023-07-12 00:50:46 +0800 |
|---|---|---|
| committer | ruki <[email protected]> | 2023-07-12 00:50:46 +0800 |
| commit | a78ac5fdec5fa7eb626c44c386cc77970f4c056c (patch) | |
| tree | f062ca33ac467d98f59d9f44cc5a988e5941feb1 | |
| parent | c93b5988ca7b374bf88b064f944a0c2f9b31810b (diff) | |
revert cmake tools
| -rw-r--r-- | xmake/modules/package/tools/cmake.lua | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/xmake/modules/package/tools/cmake.lua b/xmake/modules/package/tools/cmake.lua index 63bfa56ac..f25ec2ce9 100644 --- a/xmake/modules/package/tools/cmake.lua +++ b/xmake/modules/package/tools/cmake.lua @@ -649,7 +649,7 @@ function _get_configs_for_generator(package, configs, opt) elseif package:is_plat("mingw") and is_subhost("windows") then table.insert(configs, "-G") table.insert(configs, "MinGW Makefiles") - elseif package:is_plat("windows") and not package:config("toolchains") then + elseif package:is_plat("windows") then table.insert(configs, "-G") table.insert(configs, _get_cmake_generator_for_msvc(package)) elseif package:is_plat("wasm") and is_subhost("windows") then @@ -685,7 +685,7 @@ function _get_configs(package, configs, opt) opt._configs_str = string.serialize(configs, {indent = false, strip = true}) _get_configs_for_install(package, configs, opt) _get_configs_for_generator(package, configs, opt) - if package:is_plat("windows") and not package:config("toolchains") then + if package:is_plat("windows") then _get_configs_for_windows(package, configs, opt) elseif package:is_plat("android") then _get_configs_for_android(package, configs, opt) |