summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2020-09-29 09:38:51 (GMT)
committerKitware Robot <kwrobot@kitware.com>2020-09-29 09:39:59 (GMT)
commit7d4e9a3a3a579db66b2850beee9b70cd8e5fa6fa (patch)
tree43606e0767bb8ed1567f53f0f9e2a64ed9bedc1f
parent99f92d55d62d5cf06bcaca40cc1673b47ac1284f (diff)
parentb11c72367807bc8d3b84e9161e56f24a0f5d2ea3 (diff)
downloadCMake-7d4e9a3a3a579db66b2850beee9b70cd8e5fa6fa.zip
CMake-7d4e9a3a3a579db66b2850beee9b70cd8e5fa6fa.tar.gz
CMake-7d4e9a3a3a579db66b2850beee9b70cd8e5fa6fa.tar.bz2
Merge topic 'vs-c11' into release-3.18
b11c723678 VS: Populate `std:c{11,17}` flag table entries for v142 Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Raul Tambre <raul@tambre.ee> Merge-request: !5290
-rw-r--r--Templates/MSBuild/FlagTables/v142_CL.json14
1 files changed, 14 insertions, 0 deletions
diff --git a/Templates/MSBuild/FlagTables/v142_CL.json b/Templates/MSBuild/FlagTables/v142_CL.json
index 95b9d14..7c2d291 100644
--- a/Templates/MSBuild/FlagTables/v142_CL.json
+++ b/Templates/MSBuild/FlagTables/v142_CL.json
@@ -455,6 +455,20 @@
"flags": []
},
{
+ "name": "LanguageStandard_C",
+ "switch": "std:c11",
+ "comment": "ISO C11 Standard",
+ "value": "stdc11",
+ "flags": []
+ },
+ {
+ "name": "LanguageStandard_C",
+ "switch": "std:c17",
+ "comment": "ISO C17 (2018) Standard",
+ "value": "stdc17",
+ "flags": []
+ },
+ {
"name": "PrecompiledHeader",
"switch": "Yc",
"comment": "Create",