summaryrefslogtreecommitdiff
path: root/Templates
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2019-01-24 12:56:52 -0500
committerBrad King <brad.king@kitware.com>2019-01-24 13:19:52 -0500
commita7973ccb5310b24acdc9176555b458bad6000a43 (patch)
treead560b5bd0ab5a1585a0145d5535c65796f52c95 /Templates
parent049410c0b61aa1894cab8b3885c78d59fdcbcd9e (diff)
downloadcmake-a7973ccb5310b24acdc9176555b458bad6000a43.tar.gz
VS: Populate `/permissive` flag table entry for v142
Apply the change from commit e0d6d01e52 (VS: Add flag table entry for "permissive" flag to disable conformance mode, 2018-12-10) to the v142 flag table.
Diffstat (limited to 'Templates')
-rw-r--r--Templates/MSBuild/FlagTables/v142_CL.json9
1 files changed, 8 insertions, 1 deletions
diff --git a/Templates/MSBuild/FlagTables/v142_CL.json b/Templates/MSBuild/FlagTables/v142_CL.json
index 479df034d1..95b9d14f61 100644
--- a/Templates/MSBuild/FlagTables/v142_CL.json
+++ b/Templates/MSBuild/FlagTables/v142_CL.json
@@ -833,11 +833,18 @@
{
"name": "ConformanceMode",
"switch": "permissive-",
- "comment": "Conformance mode",
+ "comment": "Conformance mode enabled",
"value": "true",
"flags": []
},
{
+ "name": "ConformanceMode",
+ "switch": "permissive",
+ "comment": "Conformance mode disabled",
+ "value": "false",
+ "flags": []
+ },
+ {
"name": "TreatWChar_tAsBuiltInType",
"switch": "Zc:wchar_t-",
"comment": "Treat WChar_t As Built in Type",