diff options
| author | ruki <[email protected]> | 2019-02-21 23:21:04 +0800 |
|---|---|---|
| committer | ruki <[email protected]> | 2019-02-21 14:06:25 +0800 |
| commit | 64f2369facbd10688222e01611a29fac18f54301 (patch) | |
| tree | e68bac261a622f860ebbfdbd8ac1341f6f83f5e6 | |
| parent | e45301ff4d281e3a7ec302f0ad5e47e384416836 (diff) | |
fix load frameworks for qt
| -rw-r--r-- | xmake/rules/qt/load.lua | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/xmake/rules/qt/load.lua b/xmake/rules/qt/load.lua index 6413e3c27..b0fe5311c 100644 --- a/xmake/rules/qt/load.lua +++ b/xmake/rules/qt/load.lua @@ -107,14 +107,23 @@ function main(target, opt) -- add includedirs, linkdirs if is_plat("macosx") then + target:add("frameworks", "DiskArbitration", "IOKit") if useframeworks then - target:add("frameworks", "DiskArbitration", "IOKit") target:add("frameworkdirs", qt.linkdirs) target:add("rpathdirs", "@executable_path/Frameworks", qt.linkdirs) else - target:set("frameworks", "DiskArbitration", "IOKit") target:add("rpathdirs", qt.linkdirs) target:add("includedirs", path.join(qt.sdkdir, "include")) + + -- remove qt frameworks + local frameworks = table.wrap(target:get("frameworks")) + for i = #frameworks, 1, -1 do + local framework = frameworks[i] + if framework:startswith("Qt") then + table.remove(frameworks, i) + end + end + target:set("frameworks", frameworks) end target:add("includedirs", path.join(qt.sdkdir, "mkspecs/macx-clang")) target:add("linkdirs", qt.linkdirs) |