Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fixed the issue where OptiX could not correctly find the specified ve… #5588

Merged
merged 2 commits into from
Oct 28, 2024
Merged

Fixed the issue where OptiX could not correctly find the specified ve… #5588

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
95a173e
Fixed the issue where OptiX could not correctly find the specified ve…
Oct 27, 2024
a131223
Fix the bug where semver fails to parse version numbers correctly whe…
xdestiny110 Oct 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion packages/o/optix/xmake.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,14 @@ package("optix")
on_fetch(function (package, opt)
if opt.system then
import("lib.detect.find_path")
import("core.base.semver")

local paths = {"$(env OptiX_ROOT)"}
if package:is_plat("windows") then
for _, dir in ipairs(os.dirs("$(env PROGRAMDATA)/NVIDIA Corporation/OptiX SDK *.*.*")) do
table.insert(paths, dir)
if package:version_str() == "latest" or semver.satisfies(dir:match("OptiX SDK (%d+%.%d+%.%d+)"), package:version_str()) then
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

既然只匹配查找当前版本的 dir，为啥不直接在上面 os.dirs 里面 OptiX SDK *.*.* 直接改成版本呢，遍历都省了，直接一个路径 os.isdir 判断是否存在，不是更快么。。

如果是 lastest 再走 os.dirs 遍历

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

版本一般都是范围（7.x这种），取不到具体版本的情况更多

table.insert(paths, dir)
end
end
end

Expand Down
Loading