diff options
| author | ruki <[email protected]> | 2023-02-07 22:29:29 +0800 |
|---|---|---|
| committer | ruki <[email protected]> | 2023-02-07 22:29:29 +0800 |
| commit | 3bc572e74f262d23263ecf0123c13ed9f214c4fd (patch) | |
| tree | f654325865ec6efecf6cbfe99ed859b1a8e7bd73 | |
| parent | 3e81e80d61651c36766bec2f6ed18154c951c9db (diff) | |
improve packagedeps
| -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 af58da81d..b6be08af3 100644 --- a/xmake/modules/package/tools/autoconf.lua +++ b/xmake/modules/package/tools/autoconf.lua @@ -156,7 +156,7 @@ end function _get_cflags_from_packagedeps(package, opt) local result = {} for _, depname in ipairs(opt.packagedeps) do - local dep = package:dep(depname) + local dep = type(depname) == "string" and package:dep(depname) or depname if dep then local fetchinfo = dep:fetch({external = false}) if fetchinfo then @@ -173,7 +173,7 @@ end function _get_ldflags_from_packagedeps(package, opt) local result = {} for _, depname in ipairs(opt.packagedeps) do - local dep = package:dep(depname) + local dep = type(depname) == "string" and package:dep(depname) or depname if dep then local fetchinfo = dep:fetch({external = false}) if fetchinfo then diff --git a/xmake/modules/package/tools/cmake.lua b/xmake/modules/package/tools/cmake.lua index 62b1cfde5..26219d740 100644 --- a/xmake/modules/package/tools/cmake.lua +++ b/xmake/modules/package/tools/cmake.lua @@ -127,7 +127,7 @@ end function _get_cflags_from_packagedeps(package, opt) local result = {} for _, depname in ipairs(opt.packagedeps) do - local dep = package:dep(depname) + local dep = type(depname) == "string" and package:dep(depname) or depname if dep then local fetchinfo = dep:fetch({external = false}) if fetchinfo then @@ -144,7 +144,7 @@ end function _get_ldflags_from_packagedeps(package, opt) local result = {} for _, depname in ipairs(opt.packagedeps) do - local dep = package:dep(depname) + local dep = type(depname) == "string" and package:dep(depname) or depname if dep then local fetchinfo = dep:fetch({external = false}) if fetchinfo then diff --git a/xmake/modules/package/tools/meson.lua b/xmake/modules/package/tools/meson.lua index 7d4f89fac..95f777fde 100644 --- a/xmake/modules/package/tools/meson.lua +++ b/xmake/modules/package/tools/meson.lua @@ -282,7 +282,7 @@ end function _get_cflags_from_packagedeps(package, opt) local result = {} for _, depname in ipairs(opt.packagedeps) do - local dep = package:dep(depname) + local dep = type(depname) == "string" and package:dep(depname) or depname if dep then local fetchinfo = dep:fetch({external = false}) if fetchinfo then @@ -299,7 +299,7 @@ end function _get_ldflags_from_packagedeps(package, opt) local result = {} for _, depname in ipairs(opt.packagedeps) do - local dep = package:dep(depname) + local dep = type(depname) == "string" and package:dep(depname) or depname if dep then local fetchinfo = dep:fetch({external = false}) if fetchinfo then |