Forráskód Böngészése

Fix qt5lib for macOS (#1072)

* Fix qt5lib for macOS

* Update xmake.lua
Jérôme Leclercq 3 éve
szülő
commit
7c7e58a139
1 módosított fájl, 7 hozzáadás és 1 törlés
  1. 7 1
      packages/q/qt5lib/xmake.lua

+ 7 - 1
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")
         }
         }