summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorzjyhjqs <[email protected]>2024-05-26 21:55:31 +0800
committerzjyhjqs <[email protected]>2024-05-26 22:42:38 +0800
commit3f836b68c77f226fcfe4ab1623d3b0ab5d992d90 (patch)
tree6316db78d3f5b96cd1b698e15c37d6b86fef10e3
parent5955fed8d903a659920386e61427aa7509221291 (diff)
fix CMake `find_package` for config mode for all cross-compile platforms
-rw-r--r--xmake/modules/package/tools/cmake.lua3
1 files changed, 3 insertions, 0 deletions
diff --git a/xmake/modules/package/tools/cmake.lua b/xmake/modules/package/tools/cmake.lua
index f63b7ca94..df9306436 100644
--- a/xmake/modules/package/tools/cmake.lua
+++ b/xmake/modules/package/tools/cmake.lua
@@ -460,6 +460,7 @@ function _get_configs_for_appleos(package, configs, opt)
envs.CMAKE_SYSTEM_NAME = "Darwin"
end
envs.CMAKE_OSX_ARCHITECTURES = package:arch()
+ envs.CMAKE_FIND_ROOT_PATH_MODE_PACKAGE = "BOTH"
envs.CMAKE_FIND_ROOT_PATH_MODE_LIBRARY = "BOTH"
envs.CMAKE_FIND_ROOT_PATH_MODE_INCLUDE = "BOTH"
envs.CMAKE_FIND_ROOT_PATH_MODE_FRAMEWORK = "BOTH"
@@ -491,6 +492,7 @@ function _get_configs_for_mingw(package, configs, opt)
-- avoid find and add system include/library path
-- @see https://github.com/xmake-io/xmake/issues/2037
envs.CMAKE_FIND_ROOT_PATH = sdkdir
+ envs.CMAKE_FIND_ROOT_PATH_MODE_PACKAGE = "BOTH"
envs.CMAKE_FIND_ROOT_PATH_MODE_LIBRARY = "BOTH"
envs.CMAKE_FIND_ROOT_PATH_MODE_INCLUDE = "BOTH"
envs.CMAKE_FIND_ROOT_PATH_MODE_PROGRAM = "NEVER"
@@ -585,6 +587,7 @@ function _get_configs_for_cross(package, configs, opt)
-- avoid find and add system include/library path
-- @see https://github.com/xmake-io/xmake/issues/2037
envs.CMAKE_FIND_ROOT_PATH = sdkdir
+ envs.CMAKE_FIND_ROOT_PATH_MODE_PACKAGE = "BOTH"
envs.CMAKE_FIND_ROOT_PATH_MODE_LIBRARY = "BOTH"
envs.CMAKE_FIND_ROOT_PATH_MODE_INCLUDE = "BOTH"
envs.CMAKE_FIND_ROOT_PATH_MODE_PROGRAM = "NEVER"