From fcc5adff04b3b57d4ae68d86f9e7f75a7270b36b Mon Sep 17 00:00:00 2001 From: xaizek Date: Fri, 27 Jan 2023 19:08:06 +0200 Subject: 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 --- 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 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 -- cgit v1.3.1