diff options
| author | ruki <[email protected]> | 2021-04-03 20:55:47 +0800 |
|---|---|---|
| committer | GitHub <[email protected]> | 2021-04-03 20:55:47 +0800 |
| commit | 88b40ca990f035754ae55956cd645e7245a71216 (patch) | |
| tree | 8e6dfee2577926c67d7aed82e9f32da6a3214cc2 | |
| parent | 366ead217061107fdb6b562cdbab3ca7e8192b88 (diff) | |
| parent | 6018b25ca4f39ce07e9e30ddf3b144dccd4610c5 (diff) | |
Merge pull request #1317 from SirLynix/qt-sysincludes
Use sysincludes for Qt frameworks
| -rw-r--r-- | xmake/rules/qt/load.lua | 2 | ||||
| -rw-r--r-- | xmake/rules/qt/moc/xmake.lua | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/xmake/rules/qt/load.lua b/xmake/rules/qt/load.lua index faa3c0f99..407911fab 100644 --- a/xmake/rules/qt/load.lua +++ b/xmake/rules/qt/load.lua @@ -88,7 +88,7 @@ end function _add_includedirs(target, includedirs) for _, includedir in ipairs(includedirs) do if os.isdir(includedir) then - target:add("includedirs", includedir) + target:add("sysincludedirs", includedir) end end end diff --git a/xmake/rules/qt/moc/xmake.lua b/xmake/rules/qt/moc/xmake.lua index 46ff73dfa..439a0b573 100644 --- a/xmake/rules/qt/moc/xmake.lua +++ b/xmake/rules/qt/moc/xmake.lua @@ -53,7 +53,7 @@ rule("qt.moc") local flags = {} table.join2(flags, compiler.map_flags("cxx", "define", target:get("defines"))) table.join2(flags, compiler.map_flags("cxx", "includedir", target:get("includedirs"))) - table.join2(flags, compiler.map_flags("cxx", "sysincludedir", target:get("sysincludedirs"))) + table.join2(flags, compiler.map_flags("cxx", "includedir", target:get("sysincludedirs"))) -- for now, moc process doesn't support MSVC external includes flags and will fail table.join2(flags, compiler.map_flags("cxx", "frameworkdir", target:get("frameworkdirs"))) batchcmds:mkdir(path.directory(sourcefile_moc)) batchcmds:vrunv(moc, table.join(flags, sourcefile, "-o", sourcefile_moc)) |