summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--xmake/modules/package/manager/conan/v2/install_package.lua4
1 files changed, 4 insertions, 0 deletions
diff --git a/xmake/modules/package/manager/conan/v2/install_package.lua b/xmake/modules/package/manager/conan/v2/install_package.lua
index b58d28365..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,10 @@ 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
local vs_runtime = configs.vs_runtime
if vs_runtime then
profile:print("compiler.runtime=" .. (vs_runtime:startswith("MD") and "dynamic" or "static"))