From 992c21ffaf20879693656e0b62bd52ff376fcede Mon Sep 17 00:00:00 2001 From: Jérôme Leclercq Date: Sat, 3 Apr 2021 12:42:43 +0200 Subject: Make Qt use sysincludes instead of includes --- xmake/rules/qt/load.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 -- cgit v1.3.1 From 546d68e22bfb77b4e3bb49b45829ec8eee676641 Mon Sep 17 00:00:00 2001 From: Jérôme Leclercq Date: Sat, 3 Apr 2021 12:43:08 +0200 Subject: Use includedir for moc (as msvc sysincludedirs are not supported) --- xmake/rules/qt/moc/xmake.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xmake/rules/qt/moc/xmake.lua b/xmake/rules/qt/moc/xmake.lua index 46ff73dfa..4c4d304bc 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"))) 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)) -- cgit v1.3.1 From 6018b25ca4f39ce07e9e30ddf3b144dccd4610c5 Mon Sep 17 00:00:00 2001 From: Jérôme Leclercq Date: Sat, 3 Apr 2021 13:24:24 +0200 Subject: Add comment --- xmake/rules/qt/moc/xmake.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xmake/rules/qt/moc/xmake.lua b/xmake/rules/qt/moc/xmake.lua index 4c4d304bc..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", "includedir", 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)) -- cgit v1.3.1