diff options
| author | charles seizilles <[email protected]> | 2026-01-30 18:36:49 +0100 |
|---|---|---|
| committer | charles seizilles <[email protected]> | 2026-01-30 18:36:49 +0100 |
| commit | 5b723b0208d95d3734f6c467e6aaefda3201eded (patch) | |
| tree | 6638c4661175ccb47e20f55a66fb577b5d62b868 | |
| parent | 51a68ee33918b95811420beb6a56673a83abe6cc (diff) | |
find_cuda: revert breaking change
| -rw-r--r-- | xmake/modules/core/tools/gcc/has_flags.lua | 2 | ||||
| -rw-r--r-- | xmake/modules/detect/sdks/find_cuda.lua | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/xmake/modules/core/tools/gcc/has_flags.lua b/xmake/modules/core/tools/gcc/has_flags.lua index c743f91fb..5539fc0f4 100644 --- a/xmake/modules/core/tools/gcc/has_flags.lua +++ b/xmake/modules/core/tools/gcc/has_flags.lua @@ -125,7 +125,7 @@ function _check_try_running(flags, opt, islinker) if not cuda_gpu_flags then local cuda = get_config("cuda") local cuda_sdk = find_cuda(cuda) - local cuda_sdkver = cuda_sdk and cuda_sdk.sdkver or "7.0" + local cuda_sdkver = cuda_sdk and cuda_sdk.version or "7.0" if cuda_sdkver and semver.compare(cuda_sdkver, "12.0") >= 0 then table.insert(args, 1, "--cuda-gpu-arch=sm_80") end diff --git a/xmake/modules/detect/sdks/find_cuda.lua b/xmake/modules/detect/sdks/find_cuda.lua index b767e8e34..5a90cc581 100644 --- a/xmake/modules/detect/sdks/find_cuda.lua +++ b/xmake/modules/detect/sdks/find_cuda.lua @@ -131,7 +131,7 @@ function _find_cuda(sdkdir, sdkver) local includedirs = {path.join(sdkdir, "include")} -- get version - local sdkver = find_programver(path.join(bindir, "nvcc"), {parse = "release (%d+%.%d+),"}) + local version = find_programver(path.join(bindir, "nvcc"), {parse = "release (%d+%.%d+),"}) -- find msbuildextensionsdir on windows local msbuildextensionsdir @@ -140,7 +140,7 @@ function _find_cuda(sdkdir, sdkver) end -- get toolchains - return {sdkdir = sdkdir, bindir = bindir, sdkver = sdkver, linkdirs = linkdirs, includedirs = includedirs, msbuildextensionsdir = msbuildextensionsdir} + return {sdkdir = sdkdir, bindir = bindir, version = version, linkdirs = linkdirs, includedirs = includedirs, msbuildextensionsdir = msbuildextensionsdir} end -- find cuda sdk toolchains @@ -176,7 +176,7 @@ function main(sdkdir, opt) -- save to config config.set("cuda", cuda.sdkdir, {force = true, readonly = true}) - config.set("cuda_sdkver", cuda.sdkver, {force = true, readonly = true}) + config.set("cuda_sdkver", cuda.version, {force = true, readonly = true}) -- trace if opt.verbose or option.get("verbose") then |