diff options
| author | xaizek <[email protected]> | 2023-01-27 19:08:06 +0200 |
|---|---|---|
| committer | xaizek <[email protected]> | 2023-01-27 19:08:06 +0200 |
| commit | fcc5adff04b3b57d4ae68d86f9e7f75a7270b36b (patch) | |
| tree | 5e901844ecef766dbfc8f3b7ed179cb94950187c | |
| parent | a41c8f08b24be14442ddc7f816bad41fd5213c44 (diff) | |
Fix detection of target language for qt projects
Stray change in 02fb7ef69e78a5d6a8e0066f8866684533836ac3 broke it such
that language set via `set_languages()` wasn't detected and `-std=c++11`
was appended after `-std` flag that came from `set_languages()` in
`xmake.lua`.
To reproduce:
1. `xmake create -tqt.quickapp`
2. `vim xmake.lua` and add `set_languages("c++17")`
3. `xmake --verbose` and look at `-std=` options
| -rw-r--r-- | xmake/rules/qt/load.lua | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/xmake/rules/qt/load.lua b/xmake/rules/qt/load.lua index 022b37d5b..f8d86cd1b 100644 --- a/xmake/rules/qt/load.lua +++ b/xmake/rules/qt/load.lua @@ -141,7 +141,7 @@ function main(target, opt) local languages = target:get("languages") local cxxlang = false for _, lang in ipairs(languages) do - if lang:startswith("xx") or lang:startswith("++") then + if lang:startswith("cxx") or lang:startswith("c++") then cxxlang = true break end |