diff options
| author | ruki <[email protected]> | 2021-02-05 22:54:50 +0800 |
|---|---|---|
| committer | ruki <[email protected]> | 2021-02-06 16:10:15 +0800 |
| commit | 35506d101f6a836c6f8421544ee47121ddfb0407 (patch) | |
| tree | dfaa921a706d4642aca1d4183344f7b08094e7bb | |
| parent | d22cf65fb3cce961dbfbdefee29f9dfeed08f64e (diff) | |
improve qt
| -rw-r--r-- | xmake/rules/qt/load.lua | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/xmake/rules/qt/load.lua b/xmake/rules/qt/load.lua index 508810709..faa3c0f99 100644 --- a/xmake/rules/qt/load.lua +++ b/xmake/rules/qt/load.lua @@ -220,17 +220,20 @@ function main(target, opt) _add_includedirs(target, path.join(frameworkdir, "Headers")) -- e.g. QtGui.framework/Headers/5.15.0/QtGui/qpa/qplatformopenglcontext.h -- https://github.com/xmake-io/xmake/issues/1226 + _add_includedirs(target, path.join(frameworkdir, "Headers", qt.sdkver)) _add_includedirs(target, path.join(frameworkdir, "Headers", qt.sdkver, framework)) useframeworks = true else target:add("syslinks", _link(qt.libdir, framework, qt_sdkver)) _add_includedirs(target, path.join(qt.includedir, framework)) -- e.g. QtGui/5.15.0/QtGui/qpa/qplatformopenglcontext.h + _add_includedirs(target, path.join(qt.includedir, framework, qt.sdkver)) _add_includedirs(target, path.join(qt.includedir, framework, qt.sdkver, framework)) end else target:add("syslinks", _link(qt.libdir, framework, qt_sdkver)) _add_includedirs(target, path.join(qt.includedir, framework)) + _add_includedirs(target, path.join(qt.includedir, framework, qt.sdkver)) _add_includedirs(target, path.join(qt.includedir, framework, qt.sdkver, framework)) end end |