diff options
| author | Brad King <brad.king@kitware.com> | 2018-12-12 13:23:20 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2018-12-12 13:23:26 (GMT) |
| commit | 287bf93a114cae7461e8bf8da021b135ce561a1a (patch) | |
| tree | 66f1ecb24b1a2cb624fd740abc8a6455388bc6f0 | |
| parent | abccf484e3c13395520fea544885e139fc79475e (diff) | |
| parent | e0d6d01e522d4207eecc927cffabbb9a8d1b757d (diff) | |
| download | CMake-287bf93a114cae7461e8bf8da021b135ce561a1a.zip CMake-287bf93a114cae7461e8bf8da021b135ce561a1a.tar.gz CMake-287bf93a114cae7461e8bf8da021b135ce561a1a.tar.bz2 | |
Merge topic 'vs_conformance_mode_flags'
e0d6d01e52 VS: Add flag table entry for "permissive" flag to disable conformance mode
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2723
| -rw-r--r-- | Templates/MSBuild/FlagTables/v141_CL.json | 9 |
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", |