summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorfifty-six <[email protected]>2022-07-10 09:32:49 -0400
committerfifty-six <[email protected]>2022-07-10 09:32:49 -0400
commit59bc570d0541a6f4150925547544b3ee01a6df05 (patch)
treeb1e16bd483d79de85ad3386a7e3a1cf109c95e6a
parent78030eb5d15cfd5ce0c3b2a651a610aaf33f147d (diff)
Add support for cxxlatest (msvc) with CMakeLists generation
-rw-r--r--xmake/plugins/project/cmake/cmakelists.lua9
1 files changed, 8 insertions, 1 deletions
diff --git a/xmake/plugins/project/cmake/cmakelists.lua b/xmake/plugins/project/cmake/cmakelists.lua
index fbf8f22a0..062a9bad0 100644
--- a/xmake/plugins/project/cmake/cmakelists.lua
+++ b/xmake/plugins/project/cmake/cmakelists.lua
@@ -440,6 +440,7 @@ function _add_target_language_standards(cmakelists, target)
, gnuxx1z = "17"
, cxx2a = "20"
, gnuxx2a = "20"
+ , cxxlatest = "latest"
}
for _, lang in ipairs(target:get("languages")) do
local cstd = cstds[lang]
@@ -453,7 +454,13 @@ function _add_target_language_standards(cmakelists, target)
end
local cxxstd = cxxstds[lang]
if cxxstd then
- cmakelists:print("set_property(TARGET %s PROPERTY CXX_STANDARD %s)", target:name(), cxxstd)
+ if cxxstd == "latest" then
+ cmakelists:print("if (MSVC)")
+ cmakelists:print(" target_compile_options(%s PRIVATE $<$<COMPILE_LANGUAGE:CXX>:/std:c++latest>)", target:name())
+ cmakelists:print("endif()")
+ else
+ cmakelists:print("set_property(TARGET %s PROPERTY CXX_STANDARD %s)", target:name(), cxxstd)
+ end
end
end
end