summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRedbeanw44602 <[email protected]>2025-09-28 17:04:53 +0800
committerRedbeanw44602 <[email protected]>2025-09-28 17:04:53 +0800
commit1adb1f5c6fad5ea0530877618a67de45b254a758 (patch)
tree72a1f5b42c0063ac3bb32e16ffe50d611d2ee7f6
parenta9a7ebc350da4e5e7b99f98ef7ba3d0f692f2158 (diff)
fix.
-rw-r--r--xmake/modules/package/tools/cmake.lua5
1 files changed, 5 insertions, 0 deletions
diff --git a/xmake/modules/package/tools/cmake.lua b/xmake/modules/package/tools/cmake.lua
index 976c3e9be..f387fb18c 100644
--- a/xmake/modules/package/tools/cmake.lua
+++ b/xmake/modules/package/tools/cmake.lua
@@ -541,6 +541,7 @@ function _get_configs_for_appleos(package, configs, opt)
envs.CMAKE_FIND_ROOT_PATH_MODE_PROGRAM = "NEVER"
-- avoid install bundle targets
envs.CMAKE_MACOSX_BUNDLE = "NO"
+ _insert_configs_from_envs(configs, envs, opt)
_get_configs_for_generic(package, configs, opt)
end
@@ -581,6 +582,7 @@ function _get_configs_for_mingw(package, configs, opt)
envs.CMAKE_MAKE_PROGRAM = _get_mingw32_make(package)
end
_fix_cxx_compiler_cmake(package, envs)
+ _insert_configs_from_envs(configs, envs, opt)
_get_configs_for_generic(package, configs, opt)
end
@@ -609,6 +611,7 @@ function _get_configs_for_wasm(package, configs, opt)
envs.CMAKE_FIND_ROOT_PATH_MODE_LIBRARY = "BOTH"
envs.CMAKE_FIND_ROOT_PATH_MODE_INCLUDE = "BOTH"
envs.CMAKE_FIND_ROOT_PATH_MODE_PROGRAM = "NEVER"
+ _insert_configs_from_envs(configs, envs, opt)
_get_configs_for_generic(package, configs, opt)
end
@@ -669,6 +672,7 @@ function _get_configs_for_cross(package, configs, opt)
-- avoids finding host include/library path
envs.CMAKE_FIND_USE_CMAKE_SYSTEM_PATH = "0"
envs.CMAKE_FIND_USE_INSTALL_PREFIX = "0"
+ _insert_configs_from_envs(configs, envs, opt)
_get_configs_for_generic(package, configs, opt)
end
@@ -699,6 +703,7 @@ function _get_configs_for_host_toolchain(package, configs, opt)
if package:is_cross() then
envs.CMAKE_SYSTEM_NAME = "Linux"
end
+ _insert_configs_from_envs(configs, envs, opt)
_get_configs_for_generic(package, configs, opt)
end