From f97082c4db805cf7989eb6a2a1cd549a1d6d49a5 Mon Sep 17 00:00:00 2001 From: ruki Date: Sun, 5 May 2019 21:50:48 +0800 Subject: improve fetch package and envs --- xmake/modules/package/manager/xmake/find_package.lua | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'xmake/modules') diff --git a/xmake/modules/package/manager/xmake/find_package.lua b/xmake/modules/package/manager/xmake/find_package.lua index c589561a9..595612ba2 100644 --- a/xmake/modules/package/manager/xmake/find_package.lua +++ b/xmake/modules/package/manager/xmake/find_package.lua @@ -31,9 +31,14 @@ import("lib.detect.find_library") -- find package from the repository (maybe only include and no links) function _find_package_from_repo(name, opt) + -- check options + if not opt.version or not opt.buildhash then + return + end + -- find the manifest file of package, .e.g ~/.xmake/packages/z/zlib/1.1.12/ed41d5327fad3fc06fe376b4a94f62ef/manifest.txt local packagedirs = {} - table.insert(packagedirs, path.join(package.installdir(), name:sub(1, 1), name, opt.version or "*", opt.buildhash)) + table.insert(packagedirs, path.join(package.installdir(), name:sub(1, 1), name, opt.version, opt.buildhash)) local manifest_file = find_file("manifest.txt", packagedirs) if not manifest_file then return -- cgit v1.3.1