From 1d7b16ba00abc4ccc419f841179c1b04c3ebd9cc Mon Sep 17 00:00:00 2001 From: ruki Date: Sat, 1 Oct 2022 00:41:39 +0800 Subject: rename orderdeps to librarydeps --- xmake/modules/package/tools/autoconf.lua | 4 ++-- xmake/modules/package/tools/cmake.lua | 2 +- xmake/modules/package/tools/make.lua | 2 +- xmake/modules/package/tools/meson.lua | 2 +- xmake/modules/package/tools/scons.lua | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/xmake/modules/package/tools/autoconf.lua b/xmake/modules/package/tools/autoconf.lua index c9fa019bf..fe0901ad1 100644 --- a/xmake/modules/package/tools/autoconf.lua +++ b/xmake/modules/package/tools/autoconf.lua @@ -336,7 +336,7 @@ function buildenvs(package, opt) end local ACLOCAL_PATH = {} local PKG_CONFIG_PATH = {} - for _, dep in ipairs(package:orderdeps()) do + for _, dep in ipairs(package:librarydeps()) do local pkgconfig = path.join(dep:installdir(), "lib", "pkgconfig") if os.isdir(pkgconfig) then table.insert(PKG_CONFIG_PATH, pkgconfig) @@ -361,7 +361,7 @@ function autogen_envs(package, opt) local envs = {NOCONFIGURE = "yes"} local ACLOCAL_PATH = {} local PKG_CONFIG_PATH = {} - for _, dep in ipairs(package:orderdeps()) do + for _, dep in ipairs(package:librarydeps()) do local pkgconfig = path.join(dep:installdir(), "lib", "pkgconfig") if os.isdir(pkgconfig) then table.insert(PKG_CONFIG_PATH, pkgconfig) diff --git a/xmake/modules/package/tools/cmake.lua b/xmake/modules/package/tools/cmake.lua index 389dbecf6..062123ff0 100644 --- a/xmake/modules/package/tools/cmake.lua +++ b/xmake/modules/package/tools/cmake.lua @@ -615,7 +615,7 @@ function buildenvs(package, opt) local CMAKE_LIBRARY_PATH = {} local CMAKE_INCLUDE_PATH = {} local CMAKE_PREFIX_PATH = {} - for _, dep in ipairs(package:orderdeps()) do + for _, dep in ipairs(package:librarydeps()) do if dep:is_system() then local fetchinfo = dep:fetch() if fetchinfo then diff --git a/xmake/modules/package/tools/make.lua b/xmake/modules/package/tools/make.lua index 27e73b412..3e2cd6703 100644 --- a/xmake/modules/package/tools/make.lua +++ b/xmake/modules/package/tools/make.lua @@ -69,7 +69,7 @@ function buildenvs(package) end local ACLOCAL_PATH = {} local PKG_CONFIG_PATH = {} - for _, dep in ipairs(package:orderdeps()) do + for _, dep in ipairs(package:librarydeps()) do local pkgconfig = path.join(dep:installdir(), "lib", "pkgconfig") if os.isdir(pkgconfig) then table.insert(PKG_CONFIG_PATH, pkgconfig) diff --git a/xmake/modules/package/tools/meson.lua b/xmake/modules/package/tools/meson.lua index 8cb82c5a6..67be5884a 100644 --- a/xmake/modules/package/tools/meson.lua +++ b/xmake/modules/package/tools/meson.lua @@ -347,7 +347,7 @@ function buildenvs(package, opt) end local ACLOCAL_PATH = {} local PKG_CONFIG_PATH = {} - for _, dep in ipairs(package:orderdeps()) do + for _, dep in ipairs(package:librarydeps()) do local pkgconfig = path.join(dep:installdir(), "lib", "pkgconfig") if os.isdir(pkgconfig) then table.insert(PKG_CONFIG_PATH, pkgconfig) diff --git a/xmake/modules/package/tools/scons.lua b/xmake/modules/package/tools/scons.lua index 0c197933f..16055609a 100644 --- a/xmake/modules/package/tools/scons.lua +++ b/xmake/modules/package/tools/scons.lua @@ -63,7 +63,7 @@ function buildenvs(package, opt) end local ACLOCAL_PATH = {} local PKG_CONFIG_PATH = {} - for _, dep in ipairs(package:orderdeps()) do + for _, dep in ipairs(package:librarydeps()) do local pkgconfig = path.join(dep:installdir(), "lib", "pkgconfig") if os.isdir(pkgconfig) then table.insert(PKG_CONFIG_PATH, pkgconfig) -- cgit v1.3.1