Skip to content

Commit 3f836b6

Browse files
committed
fix CMake find_package for config mode for all cross-compile platforms
1 parent 5955fed commit 3f836b6

File tree

1 file changed

+3
-0
lines changed

1 file changed

+3
-0
lines changed

xmake/modules/package/tools/cmake.lua

+3
Original file line numberDiff line numberDiff line change
@@ -460,6 +460,7 @@ function _get_configs_for_appleos(package, configs, opt)
460460
envs.CMAKE_SYSTEM_NAME = "Darwin"
461461
end
462462
envs.CMAKE_OSX_ARCHITECTURES = package:arch()
463+
envs.CMAKE_FIND_ROOT_PATH_MODE_PACKAGE = "BOTH"
463464
envs.CMAKE_FIND_ROOT_PATH_MODE_LIBRARY = "BOTH"
464465
envs.CMAKE_FIND_ROOT_PATH_MODE_INCLUDE = "BOTH"
465466
envs.CMAKE_FIND_ROOT_PATH_MODE_FRAMEWORK = "BOTH"
@@ -491,6 +492,7 @@ function _get_configs_for_mingw(package, configs, opt)
491492
-- avoid find and add system include/library path
492493
-- @see https://github.com/xmake-io/xmake/issues/2037
493494
envs.CMAKE_FIND_ROOT_PATH = sdkdir
495+
envs.CMAKE_FIND_ROOT_PATH_MODE_PACKAGE = "BOTH"
494496
envs.CMAKE_FIND_ROOT_PATH_MODE_LIBRARY = "BOTH"
495497
envs.CMAKE_FIND_ROOT_PATH_MODE_INCLUDE = "BOTH"
496498
envs.CMAKE_FIND_ROOT_PATH_MODE_PROGRAM = "NEVER"
@@ -585,6 +587,7 @@ function _get_configs_for_cross(package, configs, opt)
585587
-- avoid find and add system include/library path
586588
-- @see https://github.com/xmake-io/xmake/issues/2037
587589
envs.CMAKE_FIND_ROOT_PATH = sdkdir
590+
envs.CMAKE_FIND_ROOT_PATH_MODE_PACKAGE = "BOTH"
588591
envs.CMAKE_FIND_ROOT_PATH_MODE_LIBRARY = "BOTH"
589592
envs.CMAKE_FIND_ROOT_PATH_MODE_INCLUDE = "BOTH"
590593
envs.CMAKE_FIND_ROOT_PATH_MODE_PROGRAM = "NEVER"

0 commit comments

Comments
 (0)