diff options
| author | ruki <[email protected]> | 2024-07-27 22:55:23 +0800 |
|---|---|---|
| committer | ruki <[email protected]> | 2024-07-27 22:55:23 +0800 |
| commit | e63b39cbf9a600115ecf0ee348e4eab5d7025034 (patch) | |
| tree | 6a32ee22b8706cd769ee258befa2073ce7af6ced /xmake/modules/package/tools | |
| parent | a766d76d6b3f43c4fa2058f59c565c46a59b1118 (diff) | |
fix fetch sysincludedirs
Diffstat (limited to 'xmake/modules/package/tools')
| -rw-r--r-- | xmake/modules/package/tools/autoconf.lua | 4 | ||||
| -rw-r--r-- | xmake/modules/package/tools/cmake.lua | 4 | ||||
| -rw-r--r-- | xmake/modules/package/tools/meson.lua | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/xmake/modules/package/tools/autoconf.lua b/xmake/modules/package/tools/autoconf.lua index 7636cad60..0b1512d52 100644 --- a/xmake/modules/package/tools/autoconf.lua +++ b/xmake/modules/package/tools/autoconf.lua @@ -185,7 +185,7 @@ function _get_cflags_from_packagedeps(package, opt) for _, depname in ipairs(opt.packagedeps) do local dep = type(depname) ~= "string" and depname or package:dep(depname) if dep then - local fetchinfo = dep:fetch({external = false}) + local fetchinfo = dep:fetch() if fetchinfo then table.join2(result, _map_compflags(package, "cxx", "define", fetchinfo.defines)) table.join2(result, _translate_paths(_map_compflags(package, "cxx", "includedir", fetchinfo.includedirs))) @@ -202,7 +202,7 @@ function _get_ldflags_from_packagedeps(package, opt) for _, depname in ipairs(opt.packagedeps) do local dep = type(depname) ~= "string" and depname or package:dep(depname) if dep then - local fetchinfo = dep:fetch({external = false}) + local fetchinfo = dep:fetch() if fetchinfo then table.join2(result, _translate_paths(_map_linkflags(package, "binary", {"cxx"}, "linkdir", fetchinfo.linkdirs))) table.join2(result, _map_linkflags(package, "binary", {"cxx"}, "link", fetchinfo.links)) diff --git a/xmake/modules/package/tools/cmake.lua b/xmake/modules/package/tools/cmake.lua index 77c0f6228..3d8701297 100644 --- a/xmake/modules/package/tools/cmake.lua +++ b/xmake/modules/package/tools/cmake.lua @@ -104,7 +104,7 @@ function _get_cflags_from_packagedeps(package, opt) for _, depname in ipairs(opt.packagedeps) do local dep = type(depname) ~= "string" and depname or package:dep(depname) if dep then - local fetchinfo = dep:fetch({external = false}) + local fetchinfo = dep:fetch() if fetchinfo then table.join2(result, _map_compflags(package, "cxx", "define", fetchinfo.defines)) table.join2(result, _translate_paths(_map_compflags(package, "cxx", "includedir", fetchinfo.includedirs))) @@ -121,7 +121,7 @@ function _get_ldflags_from_packagedeps(package, opt) for _, depname in ipairs(opt.packagedeps) do local dep = type(depname) ~= "string" and depname or package:dep(depname) if dep then - local fetchinfo = dep:fetch({external = false}) + local fetchinfo = dep:fetch() if fetchinfo then table.join2(result, _translate_paths(_map_linkflags(package, "binary", {"cxx"}, "linkdir", fetchinfo.linkdirs))) table.join2(result, _map_linkflags(package, "binary", {"cxx"}, "link", fetchinfo.links)) diff --git a/xmake/modules/package/tools/meson.lua b/xmake/modules/package/tools/meson.lua index fae75af6e..a9ab53ba6 100644 --- a/xmake/modules/package/tools/meson.lua +++ b/xmake/modules/package/tools/meson.lua @@ -400,7 +400,7 @@ function _get_cflags_from_packagedeps(package, opt) for _, depname in ipairs(opt.packagedeps) do local dep = type(depname) ~= "string" and depname or package:dep(depname) if dep then - local fetchinfo = dep:fetch({external = false}) + local fetchinfo = dep:fetch() if fetchinfo then table.join2(result, _map_compflags(package, "cxx", "define", fetchinfo.defines)) table.join2(result, _map_compflags(package, "cxx", "includedir", fetchinfo.includedirs)) @@ -417,7 +417,7 @@ function _get_ldflags_from_packagedeps(package, opt) for _, depname in ipairs(opt.packagedeps) do local dep = type(depname) ~= "string" and depname or package:dep(depname) if dep then - local fetchinfo = dep:fetch({external = false}) + local fetchinfo = dep:fetch() if fetchinfo then table.join2(result, _map_linkflags(package, "binary", {"cxx"}, "linkdir", fetchinfo.linkdirs)) table.join2(result, _map_linkflags(package, "binary", {"cxx"}, "link", fetchinfo.links)) |
