瀏覽代碼

[conan] share C++ standard declaration

Andrey Filipenkov 7 月之前
父節點
當前提交
3e9e47077d
共有 4 個文件被更改,包括 10 次插入3 次删除
  1. 3 1
      CI/conan/base/android
  2. 3 1
      CI/conan/base/apple
  3. 3 1
      CI/conan/base/msvc
  4. 1 0
      CI/conan/base/vars.jinja

+ 3 - 1
CI/conan/base/android

@@ -1,8 +1,10 @@
+{% import 'vars.jinja' as vars %}
+
 include(common)
 include(common)
 
 
 [settings]
 [settings]
 compiler=clang
 compiler=clang
-compiler.cppstd=17
+compiler.cppstd={{ vars.cppstd }}
 compiler.libcxx=c++_shared
 compiler.libcxx=c++_shared
 compiler.version=14
 compiler.version=14
 os=Android
 os=Android

+ 3 - 1
CI/conan/base/apple

@@ -1,8 +1,10 @@
+{% import 'vars.jinja' as vars %}
+
 include(common)
 include(common)
 
 
 [settings]
 [settings]
 compiler=apple-clang
 compiler=apple-clang
-compiler.cppstd=17
+compiler.cppstd={{ vars.cppstd }}
 compiler.libcxx=libc++
 compiler.libcxx=libc++
 compiler.version=16
 compiler.version=16
 
 

+ 3 - 1
CI/conan/base/msvc

@@ -1,8 +1,10 @@
+{% import 'vars.jinja' as vars %}
+
 include(common)
 include(common)
 
 
 [settings]
 [settings]
 compiler=msvc
 compiler=msvc
-compiler.cppstd=17
+compiler.cppstd={{ vars.cppstd }}
 compiler.runtime=dynamic
 compiler.runtime=dynamic
 compiler.version=194
 compiler.version=194
 os=Windows
 os=Windows

+ 1 - 0
CI/conan/base/vars.jinja

@@ -0,0 +1 @@
+{% set cppstd = '17' %}