summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJonathan Storey <jonathan.storey@nanoporetech.com>2018-12-10 11:59:22 (GMT)
committerJonathan Storey <jonathan.storey@nanoporetech.com>2018-12-10 16:59:19 (GMT)
commite0d6d01e522d4207eecc927cffabbb9a8d1b757d (patch)
treec32f264953daea4a2a9d70afffb8ca719546d8d1
parent4b513c0ca31d5a90b283b794397e40168070e400 (diff)
downloadCMake-e0d6d01e522d4207eecc927cffabbb9a8d1b757d.zip
CMake-e0d6d01e522d4207eecc927cffabbb9a8d1b757d.tar.gz
CMake-e0d6d01e522d4207eecc927cffabbb9a8d1b757d.tar.bz2
VS: Add flag table entry for "permissive" flag to disable conformance mode
This flag is required to disable conformance mode on specific sources when it is otherwise enabled on most sources.
-rw-r--r--Templates/MSBuild/FlagTables/v141_CL.json9
1 files changed, 8 insertions, 1 deletions
diff --git a/Templates/MSBuild/FlagTables/v141_CL.json b/Templates/MSBuild/FlagTables/v141_CL.json
index d566526..01fafe4 100644
--- a/Templates/MSBuild/FlagTables/v141_CL.json
+++ b/Templates/MSBuild/FlagTables/v141_CL.json
@@ -812,11 +812,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",