summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArthur LAURENT <[email protected]>2023-02-03 18:45:30 +0100
committerArthur LAURENT <[email protected]>2023-02-03 18:51:55 +0100
commit557a8cfeeb49b65d554b47f821026119fd4fa5fc (patch)
tree155b47a5159efc6c4c52b62082669d096d87f81d
parentc2387f757d6ad0b4cfc42841920a4b38ba1cc1e0 (diff)
fix qt cpp language detection
-rw-r--r--xmake/rules/qt/load.lua4
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