diff options
| author | Hoildkv <[email protected]> | 2021-01-24 23:28:57 +0800 |
|---|---|---|
| committer | GitHub <[email protected]> | 2021-01-24 23:28:57 +0800 |
| commit | 4e1b1064c47813648e3204bcfba12006617ef7f6 (patch) | |
| tree | ece133ff9d6e17ede050c62588ca3685b35d2e07 | |
| parent | c303863d727e33ee06762af5989a606d118fe6fa (diff) | |
Update find_tbb.lua
| -rw-r--r-- | xmake/modules/detect/packages/find_tbb.lua | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/xmake/modules/detect/packages/find_tbb.lua b/xmake/modules/detect/packages/find_tbb.lua index 2c874d7d9..dd0829750 100644 --- a/xmake/modules/detect/packages/find_tbb.lua +++ b/xmake/modules/detect/packages/find_tbb.lua @@ -38,13 +38,12 @@ function main(opt) -- init search paths
local paths = {
- "$(env ONEAPI_ROOT)\\tbb\\latest",
- "$(reg HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\{09085019-08A5-40A0-B0E8-570C171997A0};InstallLocation)\\tbb\\latest"
+ "$(env ONEAPI_ROOT)\\tbb\\latest"
}
-- find library
local result = {links = {}, linkdirs = {}, includedirs = {}}
- local linkinfo = find_library("tbb", paths, {suffixes = "lib\\" .. rdir .. "\\vc14"})
+ local linkinfo = find_library("tbb", paths, {suffixes = path.join("lib", rdir, "vc14")})
if linkinfo then
table.insert(result.linkdirs, linkinfo.linkdir)
table.join2(result.links, {"tbb", "tbb_malloc"})
@@ -54,7 +53,7 @@ function main(opt) end
-- find include
- table.insert(result.includedirs, find_path("tbb\\tbb.h", paths, {suffixes = "include"}))
+ table.insert(result.includedirs, find_path(path.join("tbb", "tbb.h"), paths, {suffixes = "include"}))
-- ok
return result
|