From 59bc570d0541a6f4150925547544b3ee01a6df05 Mon Sep 17 00:00:00 2001 From: fifty-six Date: Sun, 10 Jul 2022 09:32:49 -0400 Subject: Add support for cxxlatest (msvc) with CMakeLists generation --- xmake/plugins/project/cmake/cmakelists.lua | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) 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 $<$:/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 -- cgit v1.3.1