From 125c24a7fc6eecfdb1221a823d534472b1bdceca Mon Sep 17 00:00:00 2001 From: star9029 Date: Fri, 6 Sep 2024 21:05:29 +0800 Subject: Fix cmake find_package on wasm --- xmake/modules/package/tools/cmake.lua | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/xmake/modules/package/tools/cmake.lua b/xmake/modules/package/tools/cmake.lua index 8e103959d..dac716560 100644 --- a/xmake/modules/package/tools/cmake.lua +++ b/xmake/modules/package/tools/cmake.lua @@ -610,7 +610,18 @@ function _get_configs_for_wasm(package, configs, opt) end end end + + local envs = {} + local deps_installdir = {} + for _, dep in ipairs(package:librarydeps({private = true})) do + if not dep:is_system() then + table.insert(deps_installdir, dep:installdir()) + end + end + -- https://github.com/emscripten-core/emscripten/issues/13310 + envs.CMAKE_FIND_ROOT_PATH = path.joinenv(deps_installdir) _get_configs_for_generic(package, configs, opt) + _insert_configs_from_envs(configs, envs, opt) end -- get configs for cross -- cgit v1.3.1