From a5f69f3a6a915471561d9b2382ad5fefe893cac9 Mon Sep 17 00:00:00 2001 From: Jérôme Leclercq Date: Fri, 3 Mar 2023 16:21:59 +0100 Subject: Fix rust library name (#3452) Note, this only works for most Rust crates, but some (such as obj-rs) rename their library file. --- xmake/modules/package/manager/cargo/find_package.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xmake/modules/package/manager/cargo/find_package.lua b/xmake/modules/package/manager/cargo/find_package.lua index d53268333..577fbf253 100644 --- a/xmake/modules/package/manager/cargo/find_package.lua +++ b/xmake/modules/package/manager/cargo/find_package.lua @@ -33,7 +33,7 @@ import("lib.detect.find_file") -- sdl2 -> libsdl2 -- obj-rs -> libobj function _get_libname(name) - return "lib" .. name:split("%-")[1] + return "lib" .. name:gsub("-", "_") end -- get the name set of libraries -- cgit v1.3.1 From 42ab75a7b2d2553cea8f5e797a51b226c146c376 Mon Sep 17 00:00:00 2001 From: Jérôme Leclercq Date: Fri, 3 Mar 2023 16:45:05 +0100 Subject: Update find_package.lua --- xmake/modules/package/manager/cargo/find_package.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xmake/modules/package/manager/cargo/find_package.lua b/xmake/modules/package/manager/cargo/find_package.lua index 577fbf253..ee17ac7ec 100644 --- a/xmake/modules/package/manager/cargo/find_package.lua +++ b/xmake/modules/package/manager/cargo/find_package.lua @@ -31,7 +31,7 @@ import("lib.detect.find_file") -- -- e.g. -- sdl2 -> libsdl2 --- obj-rs -> libobj +-- future-util -> libfuture_util function _get_libname(name) return "lib" .. name:gsub("-", "_") end -- cgit v1.3.1