Fix qt5lib for macOS (#1072)

* Fix qt5lib for macOS

* Update xmake.lua
pull/1073/head
Jérôme Leclercq 3 years ago committed by GitHub
parent d0d18a56fc
commit 7c7e58a139
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 8
      packages/q/qt5lib/xmake.lua

@ -27,6 +27,7 @@ package("qt5lib")
local links = table.wrap(package:data("links")) local links = table.wrap(package:data("links"))
local includedirs = {qt.includedir} local includedirs = {qt.includedir}
local linkname local linkname
local frameworks
if package:is_plat("windows") then if package:is_plat("windows") then
linkname = "Qt5" .. libname linkname = "Qt5" .. libname
if package:is_debug() then if package:is_debug() then
@ -54,6 +55,11 @@ package("qt5lib")
end end
table.insert(links, 1, linkname) table.insert(links, 1, linkname)
if frameworks then
table.join2(frameworks, package:data("frameworks"))
else
frameworks = package:data("frameworks")
end
return { return {
qtdir = qt, qtdir = qt,
@ -61,7 +67,7 @@ package("qt5lib")
includedirs = includedirs, includedirs = includedirs,
links = links, links = links,
linkdirs = qt.libdir, linkdirs = qt.libdir,
frameworks = package:data("frameworks"), frameworks = frameworks,
frameworkdirs = qt.libdir, frameworkdirs = qt.libdir,
syslinks = package:data("syslinks") syslinks = package:data("syslinks")
} }

Loading…
Cancel
Save