diff options
| author | ruki <[email protected]> | 2023-01-06 09:23:38 +0800 |
|---|---|---|
| committer | GitHub <[email protected]> | 2023-01-06 09:23:38 +0800 |
| commit | 1938de01114d01584b8a6e24b8e7c7980a9250eb (patch) | |
| tree | d3f7347a90ee1346d55f854fde0e32de1fea67c9 | |
| parent | 598428d35d8f259a87102d1fe17027a503633652 (diff) | |
Update load.lua
| -rw-r--r-- | xmake/rules/qt/load.lua | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/xmake/rules/qt/load.lua b/xmake/rules/qt/load.lua index 32be0bd61..022b37d5b 100644 --- a/xmake/rules/qt/load.lua +++ b/xmake/rules/qt/load.lua @@ -152,7 +152,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 (not cppversion == "latest") or (tonumber(cppversion) and tonumber(cppversion) < 17) then + if (not cppversion) or (cppversion ~= "latest") or (tonumber(cppversion) and tonumber(cppversion) < 17) then target:add("languages", "c++17") end -- @see https://github.com/xmake-io/xmake/issues/2071 @@ -162,10 +162,9 @@ 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 (not cppversion == "latest") or (tonumber(cppversion) and tonumber(cppversion) < 11) then - target:add("languages", "c++17") + if (not cppversion) or (cppversion ~= "latest") or (tonumber(cppversion) and tonumber(cppversion) < 11) then + target:add("languages", "c++11") end - target:add("languages", "c++11") end end |