|
|
@ -52,12 +52,12 @@ function main(package, opt) |
|
|
|
local result |
|
|
|
local result |
|
|
|
if package:is_plat("windows") then |
|
|
|
if package:is_plat("windows") then |
|
|
|
result = _find_package_on_windows(package, opt) |
|
|
|
result = _find_package_on_windows(package, opt) |
|
|
|
|
|
|
|
if opt.require_version and result and result.version and not semver.satisfies(result.version, opt.require_version) then |
|
|
|
|
|
|
|
result = nil |
|
|
|
|
|
|
|
end |
|
|
|
else |
|
|
|
else |
|
|
|
result = package:find_package("tbb", opt) |
|
|
|
result = package:find_package("tbb", opt) |
|
|
|
end |
|
|
|
end |
|
|
|
if opt.require_version and result.version and not semver.satisfies(result.version, opt.require_version) then |
|
|
|
|
|
|
|
result = nil |
|
|
|
|
|
|
|
end |
|
|
|
|
|
|
|
return result or false |
|
|
|
return result or false |
|
|
|
end |
|
|
|
end |
|
|
|
end |
|
|
|
end |
|
|
|