Skip to content

Commit 0d2d893

Browse files
committed
update cmake trybuild
1 parent 3f836b6 commit 0d2d893

File tree

1 file changed

+13
-4
lines changed
  • xmake/modules/private/action/trybuild

1 file changed

+13
-4
lines changed

xmake/modules/private/action/trybuild/cmake.lua

+13-4
Original file line numberDiff line numberDiff line change
@@ -134,6 +134,13 @@ function _get_configs_for_android(configs)
134134
if ndk_cxxstl then
135135
table.insert(configs, "-DANDROID_STL=" .. ndk_cxxstl)
136136
end
137+
138+
-- avoid find and add system include/library path
139+
-- @see https://github.com/xmake-io/xmake/issues/2037
140+
table.insert(configs, "-DCMAKE_FIND_ROOT_PATH_MODE_PACKAGE=BOTH")
141+
table.insert(configs, "-DCMAKE_FIND_ROOT_PATH_MODE_LIBRARY=BOTH")
142+
table.insert(configs, "-DCMAKE_FIND_ROOT_PATH_MODE_INCLUDE=BOTH")
143+
table.insert(configs, "-DCMAKE_FIND_ROOT_PATH_MODE_PROGRAM=NEVER")
137144
end
138145
end
139146

@@ -195,8 +202,9 @@ function _get_configs_for_mingw(configs)
195202
-- avoid find and add system include/library path
196203
envs.CMAKE_FIND_ROOT_PATH = sdkdir
197204
envs.CMAKE_SYSROOT = sdkdir
198-
envs.CMAKE_FIND_ROOT_PATH_MODE_LIBRARY = "ONLY"
199-
envs.CMAKE_FIND_ROOT_PATH_MODE_INCLUDE = "ONLY"
205+
envs.CMAKE_FIND_ROOT_PATH_MODE_PACKAGE = "BOTH"
206+
envs.CMAKE_FIND_ROOT_PATH_MODE_LIBRARY = "BOTH"
207+
envs.CMAKE_FIND_ROOT_PATH_MODE_INCLUDE = "BOTH"
200208
envs.CMAKE_FIND_ROOT_PATH_MODE_PROGRAM = "NEVER"
201209
-- avoid add -isysroot on macOS
202210
envs.CMAKE_OSX_SYSROOT = ""
@@ -260,8 +268,9 @@ function _get_configs_for_cross(configs)
260268
-- avoid find and add system include/library path
261269
envs.CMAKE_FIND_ROOT_PATH = sdkdir
262270
envs.CMAKE_SYSROOT = sdkdir
263-
envs.CMAKE_FIND_ROOT_PATH_MODE_LIBRARY = "ONLY"
264-
envs.CMAKE_FIND_ROOT_PATH_MODE_INCLUDE = "ONLY"
271+
envs.CMAKE_FIND_ROOT_PATH_MODE_PACKAGE = "BOTH"
272+
envs.CMAKE_FIND_ROOT_PATH_MODE_LIBRARY = "BOTH"
273+
envs.CMAKE_FIND_ROOT_PATH_MODE_INCLUDE = "BOTH"
265274
envs.CMAKE_FIND_ROOT_PATH_MODE_PROGRAM = "NEVER"
266275
-- avoid add -isysroot on macOS
267276
envs.CMAKE_OSX_SYSROOT = ""

0 commit comments

Comments
 (0)