diff options
Diffstat (limited to 'xmake')
| -rw-r--r-- | xmake/rules/qt/load.lua | 14 | ||||
| -rw-r--r-- | xmake/rules/qt/moc/xmake.lua | 2 |
2 files changed, 13 insertions, 3 deletions
diff --git a/xmake/rules/qt/load.lua b/xmake/rules/qt/load.lua index 638d61e56..e449a7c69 100644 --- a/xmake/rules/qt/load.lua +++ b/xmake/rules/qt/load.lua @@ -71,8 +71,18 @@ function main(target, opt) target:add("mxflags", "-fPIC") target:add("asflags", "-fPIC") - -- need c++11 - target:set("languages", "cxx11") + -- need c++11 at least + local languages = target:get("languages") + local cxxlang = false + for _, lang in ipairs(languages) do + if lang:startswith("cxx") or lang:startswith("c++") then + cxxlang = true + break + end + end + if not cxxlang then + target:add("languages", "cxx11") + end -- add defines for the compile mode if is_mode("debug") then diff --git a/xmake/rules/qt/moc/xmake.lua b/xmake/rules/qt/moc/xmake.lua index 4c9067f6b..9542ed7e8 100644 --- a/xmake/rules/qt/moc/xmake.lua +++ b/xmake/rules/qt/moc/xmake.lua @@ -25,7 +25,7 @@ rule("qt.moc") add_deps("qt.env") -- set extensions - set_extensions(".h") + set_extensions(".h", ".hpp") -- before load before_load(function (target) |