diff options
| author | ruki <[email protected]> | 2019-03-12 00:45:31 +0800 |
|---|---|---|
| committer | ruki <[email protected]> | 2019-03-11 22:33:09 +0800 |
| commit | 8541ae05682284924df02b08161f384f5003f4dd (patch) | |
| tree | 1308bc88ff221515eee1dbca86b3e6eb148acc2a | |
| parent | 08162f29172031440607bba5bf0e759a3c0ba447 (diff) | |
improve find xmake packages
| -rw-r--r-- | xmake/modules/package/manager/find_package.lua | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/xmake/modules/package/manager/find_package.lua b/xmake/modules/package/manager/find_package.lua index 7fec292e5..49ec98208 100644 --- a/xmake/modules/package/manager/find_package.lua +++ b/xmake/modules/package/manager/find_package.lua @@ -127,16 +127,6 @@ function _find_package(manager_name, package_name, opt) -- remove repeat result.linkdirs = table.unique(result.linkdirs) result.includedirs = table.unique(result.includedirs) - - -- check valid version - if result.version then - local version = try { function () return semver.new(result.version) end } - if version then - result.version = version:rawstr() - else - result.version = nil - end - end end -- ok? @@ -191,7 +181,7 @@ function main(name, opt) -- match version? if opt.version and result then - if not result.version or not semver.satisfies(result.version, opt.version) then + if not (result.version and (result.version == opt.version or semver.satisfies(result.version, opt.version))) then result = nil end end |