From 8603d1138632d12ca29648ad66d04ffca54c358f Mon Sep 17 00:00:00 2001 From: Tiangang Song Date: Fri, 21 Jul 2023 18:13:13 -0700 Subject: Set cppstd for msvc in conan 2.0 --- xmake/modules/package/manager/conan/v2/install_package.lua | 3 +++ 1 file changed, 3 insertions(+) diff --git a/xmake/modules/package/manager/conan/v2/install_package.lua b/xmake/modules/package/manager/conan/v2/install_package.lua index b58d28365..102a8abeb 100644 --- a/xmake/modules/package/manager/conan/v2/install_package.lua +++ b/xmake/modules/package/manager/conan/v2/install_package.lua @@ -178,6 +178,9 @@ function _conan_generate_compiler_profile(profile, configs, opt) local vs = assert(config.get("vs"), "vs not found!") profile:print("compiler=msvc") profile:print("compiler.version=" .. assert(vsvers[vs], "unknown msvc version!")) + if vs >= 2015 then + profile:print("compiler.cppstd=14") + end local vs_runtime = configs.vs_runtime if vs_runtime then profile:print("compiler.runtime=" .. (vs_runtime:startswith("MD") and "dynamic" or "static")) -- cgit v1.3.1 From fb87d9b6f84b175f8e3c73485ab04d5b78b0e646 Mon Sep 17 00:00:00 2001 From: ruki Date: Sat, 22 Jul 2023 22:23:10 +0800 Subject: Update install_package.lua --- xmake/modules/package/manager/conan/v2/install_package.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/xmake/modules/package/manager/conan/v2/install_package.lua b/xmake/modules/package/manager/conan/v2/install_package.lua index 102a8abeb..516f43eaa 100644 --- a/xmake/modules/package/manager/conan/v2/install_package.lua +++ b/xmake/modules/package/manager/conan/v2/install_package.lua @@ -178,6 +178,7 @@ function _conan_generate_compiler_profile(profile, configs, opt) local vs = assert(config.get("vs"), "vs not found!") profile:print("compiler=msvc") profile:print("compiler.version=" .. assert(vsvers[vs], "unknown msvc version!")) + -- @see https://github.com/conan-io/conan/issues/12387 if vs >= 2015 then profile:print("compiler.cppstd=14") end -- cgit v1.3.1