summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorruki <[email protected]>2025-09-15 22:41:09 +0800
committerruki <[email protected]>2025-09-15 22:41:09 +0800
commit68076a52c7085873887032a630be94244d0dc7a1 (patch)
tree7be1cad921b213aed0fba7e923b7c8d90b94fed6
parentec46b858be4de1a09802ced44ea8e2860edd093a (diff)
revert cmake default flags #6781
-rw-r--r--xmake/modules/package/tools/cmake.lua4
1 files changed, 1 insertions, 3 deletions
diff --git a/xmake/modules/package/tools/cmake.lua b/xmake/modules/package/tools/cmake.lua
index 86754f13c..77b9a82b3 100644
--- a/xmake/modules/package/tools/cmake.lua
+++ b/xmake/modules/package/tools/cmake.lua
@@ -942,9 +942,6 @@ function _get_configs(package, configs, opt)
configs = configs or {}
opt._configs_str = string.serialize(configs, {indent = false, strip = true})
- -- we need to get the default flags first to avoid being overwritten.
- -- @see https://github.com/xmake-io/xmake/issues/6781
- local envs = _get_envs_for_default_flags(package, configs, opt)
_get_configs_for_install(package, configs, opt)
_get_configs_for_generator(package, configs, opt)
@@ -980,6 +977,7 @@ function _get_configs(package, configs, opt)
table.insert(configs, "-DCMAKE_POLICY_VERSION_MINIMUM=3.5")
end
+ local envs = _get_envs_for_default_flags(package, configs, opt)
local runtime_envs = _get_envs_for_runtime_flags(package, configs, opt)
if runtime_envs then
envs = envs or {}