diff options
| author | ruki <[email protected]> | 2025-07-31 14:41:55 +0800 |
|---|---|---|
| committer | GitHub <[email protected]> | 2025-07-31 14:41:55 +0800 |
| commit | c3fc9f283a3d30bfabe0e57a1d8fe7b9e7bfa8c2 (patch) | |
| tree | e9990446e6cb24b3538e33a78aacf6004af2f420 | |
| parent | 342d8b11ea90716383efc3b7a5f885f160b8b7b1 (diff) | |
| parent | b2cb07b4e3b91d2dcb43fc18e06c9ca77e1de381 (diff) | |
Merge pull request #6665 from xmake-io/mingw
fix cmake/mingw #6660
| -rw-r--r-- | xmake/modules/package/tools/cmake.lua | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/xmake/modules/package/tools/cmake.lua b/xmake/modules/package/tools/cmake.lua index b677a8f0f..eb0d85440 100644 --- a/xmake/modules/package/tools/cmake.lua +++ b/xmake/modules/package/tools/cmake.lua @@ -595,7 +595,10 @@ function _get_configs_for_mingw(package, configs, opt) envs.CMAKE_SYSTEM_PROCESSOR = _get_cmake_system_processor(package) -- avoid find and add system include/library path -- @see https://github.com/xmake-io/xmake/issues/2037 - envs.CMAKE_FIND_ROOT_PATH = sdkdir + -- https://github.com/xmake-io/xmake/issues/6660 + if sdkdir and sdkdir ~= "/usr" then + envs.CMAKE_FIND_ROOT_PATH = sdkdir + end envs.CMAKE_FIND_ROOT_PATH_MODE_PACKAGE = "BOTH" envs.CMAKE_FIND_ROOT_PATH_MODE_LIBRARY = "BOTH" envs.CMAKE_FIND_ROOT_PATH_MODE_INCLUDE = "BOTH" @@ -692,7 +695,10 @@ function _get_configs_for_cross(package, configs, opt) end -- avoid find and add system include/library path -- @see https://github.com/xmake-io/xmake/issues/2037 - envs.CMAKE_FIND_ROOT_PATH = sdkdir + -- https://github.com/xmake-io/xmake/issues/6660 + if sdkdir and sdkdir ~= "/usr" then + envs.CMAKE_FIND_ROOT_PATH = sdkdir + end envs.CMAKE_FIND_ROOT_PATH_MODE_PACKAGE = "BOTH" envs.CMAKE_FIND_ROOT_PATH_MODE_LIBRARY = "BOTH" envs.CMAKE_FIND_ROOT_PATH_MODE_INCLUDE = "BOTH" @@ -712,7 +718,6 @@ function _get_configs_for_host_toolchain(package, configs, opt) opt = opt or {} opt.cross = true local envs = {} - local sdkdir = _translate_paths(package:build_getenv("sdk")) envs.CMAKE_C_COMPILER = _translate_bin_path(package:build_getenv("cc")) envs.CMAKE_CXX_COMPILER = _translate_bin_path(package:build_getenv("cxx")) envs.CMAKE_ASM_COMPILER = _translate_bin_path(package:build_getenv("as")) |