summaryrefslogtreecommitdiff
path: root/xmake/modules/package/manager
diff options
context:
space:
mode:
authorruki <[email protected]>2024-12-17 23:20:12 +0800
committerruki <[email protected]>2024-12-17 23:20:12 +0800
commitcd00417c43706fb44b07fc6ca3da1786ea93e2ea (patch)
treef95bb0bf100279a24e42ffe5b1a4bd5dcc51accf /xmake/modules/package/manager
parentb31c6509a8707ce7847e0ce9ea1322286edf1d30 (diff)
improve toolset
Diffstat (limited to 'xmake/modules/package/manager')
-rw-r--r--xmake/modules/package/manager/nuget/find_package.lua4
1 files changed, 3 insertions, 1 deletions
diff --git a/xmake/modules/package/manager/nuget/find_package.lua b/xmake/modules/package/manager/nuget/find_package.lua
index 896eeb243..5af474c69 100644
--- a/xmake/modules/package/manager/nuget/find_package.lua
+++ b/xmake/modules/package/manager/nuget/find_package.lua
@@ -23,8 +23,10 @@ import("lib.detect.find_file")
import("lib.detect.find_tool")
import("core.base.option")
import("core.base.json")
+import("core.tool.toolchain")
import("core.project.config")
import("core.project.target")
+import("private.utils.toolchain", {alias = "toolchain_utils"})
-- find native package files
-- e.g.
@@ -72,7 +74,7 @@ function _find_package(name, result, opt)
local installdir = path.join(opt.packagesdir, name)
local libdir = "build/native/lib"
local runtime = assert(runtimes[configs.runtimes], "unknown runtimes %s", configs.runtimes)
- local toolset = "v142"
+ local toolset = toolchain_utils.get_vs_toolset_ver(toolchain.load("msvc", {plat = plat, arch = arch}):config("vs_toolset") or config.get("vs_toolset"))
local libarch = libarchs[arch] or "x64"
local libmode = configs.debug and "Debug" or "Release"
for _, file in ipairs(libinfo.files) do