From 33f1ec40fdfdcba4e2ae1e40d0050868ca4dca76 Mon Sep 17 00:00:00 2001 From: ruki Date: Mon, 4 Sep 2023 23:51:00 +0800 Subject: get librarydeps with private --- xmake/modules/package/tools/autoconf.lua | 4 ++-- xmake/modules/package/tools/cmake.lua | 4 +++- xmake/modules/package/tools/make.lua | 2 +- xmake/modules/package/tools/meson.lua | 2 +- xmake/modules/package/tools/scons.lua | 2 +- 5 files changed, 8 insertions(+), 6 deletions(-) (limited to 'xmake/modules/package') diff --git a/xmake/modules/package/tools/autoconf.lua b/xmake/modules/package/tools/autoconf.lua index 1512173dd..faa842d54 100644 --- a/xmake/modules/package/tools/autoconf.lua +++ b/xmake/modules/package/tools/autoconf.lua @@ -362,7 +362,7 @@ function buildenvs(package, opt) end local ACLOCAL_PATH = {} local PKG_CONFIG_PATH = {} - for _, dep in ipairs(package:librarydeps()) do + for _, dep in ipairs(package:librarydeps({private = true})) do local pkgconfig = path.join(dep:installdir(), "lib", "pkgconfig") if os.isdir(pkgconfig) then table.insert(PKG_CONFIG_PATH, pkgconfig) @@ -390,7 +390,7 @@ function autogen_envs(package, opt) local envs = {NOCONFIGURE = "yes"} local ACLOCAL_PATH = {} local PKG_CONFIG_PATH = {} - for _, dep in ipairs(package:librarydeps()) do + for _, dep in ipairs(package:librarydeps({private = true})) 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 2174508e2..c0076a83c 100644 --- a/xmake/modules/package/tools/cmake.lua +++ b/xmake/modules/package/tools/cmake.lua @@ -739,11 +739,13 @@ function buildenvs(package, opt) end -- add environments for cmake/find_packages + -- and we need also find them from private libraries, + -- @see https://github.com/xmake-io/xmake-repo/pull/2553 local CMAKE_LIBRARY_PATH = {} local CMAKE_INCLUDE_PATH = {} local CMAKE_PREFIX_PATH = {} local PKG_CONFIG_PATH = {} - for _, dep in ipairs(package:librarydeps()) do + for _, dep in ipairs(package:librarydeps({private = true})) 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 283f3d290..7b172ed3f 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:librarydeps()) do + for _, dep in ipairs(package:librarydeps({private = true})) 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 6527a2e2b..1a73328cb 100644 --- a/xmake/modules/package/tools/meson.lua +++ b/xmake/modules/package/tools/meson.lua @@ -396,7 +396,7 @@ function buildenvs(package, opt) end local ACLOCAL_PATH = {} local PKG_CONFIG_PATH = {} - for _, dep in ipairs(package:librarydeps()) do + for _, dep in ipairs(package:librarydeps({private = true})) 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 1b59db92e..f9208042d 100644 --- a/xmake/modules/package/tools/scons.lua +++ b/xmake/modules/package/tools/scons.lua @@ -75,7 +75,7 @@ function buildenvs(package, opt) end local ACLOCAL_PATH = {} local PKG_CONFIG_PATH = {} - for _, dep in ipairs(package:librarydeps()) do + for _, dep in ipairs(package:librarydeps({private = true})) do local pkgconfig = path.join(dep:installdir(), "lib", "pkgconfig") if os.isdir(pkgconfig) then table.insert(PKG_CONFIG_PATH, pkgconfig) -- cgit v1.3.1