diff options
| author | ruki <[email protected]> | 2023-02-04 09:06:11 +0800 |
|---|---|---|
| committer | GitHub <[email protected]> | 2023-02-04 09:06:11 +0800 |
| commit | c814b6d5fde13577d46184ef9aae0c1bd21e24e2 (patch) | |
| tree | f56aa796a3a86d63a347e21eb3dce5b8dedaaac3 | |
| parent | 5d2adef6060dbdc6620e99fbac787aecbe396f0f (diff) | |
| parent | 557a8cfeeb49b65d554b47f821026119fd4fa5fc (diff) | |
Merge pull request #3331 from Arthapz/fix-qt-cpplanguage
fix qt cpp language detection
| -rw-r--r-- | xmake/rules/qt/load.lua | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/xmake/rules/qt/load.lua b/xmake/rules/qt/load.lua index 1fc92b949..7ed4f5049 100644 --- a/xmake/rules/qt/load.lua +++ b/xmake/rules/qt/load.lua @@ -153,7 +153,7 @@ function main(target, opt) local cppversion = _get_target_cppversion(target) if qt_sdkver:ge("6.0") then -- add conditionnaly c++17 to avoid for example "cl : Command line warning D9025 : overriding '/std:c++latest' with '/std:c++17'" warning - if (not cppversion) or (cppversion ~= "latest") or (tonumber(cppversion) and tonumber(cppversion) < 17) then + if (not cppversion) or (tonumber(cppversion) and tonumber(cppversion) < 17) then target:add("languages", "c++17") end -- @see https://github.com/xmake-io/xmake/issues/2071 @@ -163,7 +163,7 @@ function main(target, opt) end else -- add conditionnaly c++11 to avoid for example "cl : Command line warning D9025 : overriding '/std:c++latest' with '/std:c++11'" warning - if (not cppversion) or (cppversion ~= "latest") or (tonumber(cppversion) and tonumber(cppversion) < 11) then + if (not cppversion) or (tonumber(cppversion) and tonumber(cppversion) < 11) then target:add("languages", "c++11") end end |