summaryrefslogtreecommitdiffstats
path: root/Templates
diff options
context:
space:
mode:
authorStephan Szabo <stephan.szabo@sony.com>2018-11-26 16:43:39 (GMT)
committerStephan Szabo <stephan.szabo@sony.com>2018-11-28 15:43:29 (GMT)
commit44dc9fc48af8171423b4d5e996a8415dfd5f96c0 (patch)
tree44bf6450b66bb008becafb9d1a1594430ce15068 /Templates
parentaba364d190fca77d86412f25968a597edf3d725f (diff)
downloadCMake-44dc9fc48af8171423b4d5e996a8415dfd5f96c0.zip
CMake-44dc9fc48af8171423b4d5e996a8415dfd5f96c0.tar.gz
CMake-44dc9fc48af8171423b4d5e996a8415dfd5f96c0.tar.bz2
VS: Fix /analyze:log flag mapping (#14858)
Original header commits: v11/v12 commit v3.1.0-rc1~695^2 v140/v141 commit v3.1.0-rc1~358^2~3 Fix the VS 11 and VS 12 flag table entries for this flag. It requires a value in the following argument. Also drop the general "/analyze:" flag table entry so that such flags will be passed through as plain additional options. This is necessary because some such options have following values and some do not but not all have .vcxproj elements to hold the values.
Diffstat (limited to 'Templates')
-rw-r--r--Templates/MSBuild/FlagTables/v11_CL.json18
-rw-r--r--Templates/MSBuild/FlagTables/v12_CL.json18
-rw-r--r--Templates/MSBuild/FlagTables/v140_CL.json18
-rw-r--r--Templates/MSBuild/FlagTables/v141_CL.json18
4 files changed, 16 insertions, 56 deletions
diff --git a/Templates/MSBuild/FlagTables/v11_CL.json b/Templates/MSBuild/FlagTables/v11_CL.json
index e1c3871..ffbf274 100644
--- a/Templates/MSBuild/FlagTables/v11_CL.json
+++ b/Templates/MSBuild/FlagTables/v11_CL.json
@@ -937,13 +937,12 @@
]
},
{
- "name": "PREfastAdditionalOptions",
- "switch": "analyze:",
- "comment": "Additional Code Analysis Native options",
+ "name": "PREfastLog",
+ "switch": "analyze:log",
+ "comment": "Code Analysis Log",
"value": "",
"flags": [
- "UserValue",
- "SemicolonAppendable"
+ "UserFollowing"
]
},
{
@@ -1052,15 +1051,6 @@
]
},
{
- "name": "PREfastLog",
- "switch": "analyze:log",
- "comment": "Code Analysis Log",
- "value": "",
- "flags": [
- "UserValue"
- ]
- },
- {
"name": "ProcessorNumber",
"switch": "MP",
"comment": "Number of processors",
diff --git a/Templates/MSBuild/FlagTables/v12_CL.json b/Templates/MSBuild/FlagTables/v12_CL.json
index 39d08a3..72618e2 100644
--- a/Templates/MSBuild/FlagTables/v12_CL.json
+++ b/Templates/MSBuild/FlagTables/v12_CL.json
@@ -951,13 +951,12 @@
]
},
{
- "name": "PREfastAdditionalOptions",
- "switch": "analyze:",
- "comment": "Additional Code Analysis Native options",
+ "name": "PREfastLog",
+ "switch": "analyze:log",
+ "comment": "Code Analysis Log",
"value": "",
"flags": [
- "UserValue",
- "SemicolonAppendable"
+ "UserFollowing"
]
},
{
@@ -1066,15 +1065,6 @@
]
},
{
- "name": "PREfastLog",
- "switch": "analyze:log",
- "comment": "Code Analysis Log",
- "value": "",
- "flags": [
- "UserValue"
- ]
- },
- {
"name": "ProcessorNumber",
"switch": "MP",
"comment": "Number of processors",
diff --git a/Templates/MSBuild/FlagTables/v140_CL.json b/Templates/MSBuild/FlagTables/v140_CL.json
index 1a81098..49ad625 100644
--- a/Templates/MSBuild/FlagTables/v140_CL.json
+++ b/Templates/MSBuild/FlagTables/v140_CL.json
@@ -979,13 +979,12 @@
]
},
{
- "name": "PREfastAdditionalOptions",
- "switch": "analyze:",
- "comment": "Additional Code Analysis Native options",
+ "name": "PREfastLog",
+ "switch": "analyze:log",
+ "comment": "Code Analysis Log",
"value": "",
"flags": [
- "UserValue",
- "SemicolonAppendable"
+ "UserFollowing"
]
},
{
@@ -1103,15 +1102,6 @@
]
},
{
- "name": "PREfastLog",
- "switch": "analyze:log",
- "comment": "Code Analysis Log",
- "value": "",
- "flags": [
- "UserValue"
- ]
- },
- {
"name": "ProcessorNumber",
"switch": "MP",
"comment": "Number of processors",
diff --git a/Templates/MSBuild/FlagTables/v141_CL.json b/Templates/MSBuild/FlagTables/v141_CL.json
index c624603..2da38aa 100644
--- a/Templates/MSBuild/FlagTables/v141_CL.json
+++ b/Templates/MSBuild/FlagTables/v141_CL.json
@@ -1049,13 +1049,12 @@
]
},
{
- "name": "PREfastAdditionalOptions",
- "switch": "analyze:",
- "comment": "Additional Code Analysis Native options",
+ "name": "PREfastLog",
+ "switch": "analyze:log",
+ "comment": "Code Analysis Log",
"value": "",
"flags": [
- "UserValue",
- "SemicolonAppendable"
+ "UserFollowing"
]
},
{
@@ -1173,15 +1172,6 @@
]
},
{
- "name": "PREfastLog",
- "switch": "analyze:log",
- "comment": "Code Analysis Log",
- "value": "",
- "flags": [
- "UserValue"
- ]
- },
- {
"name": "ProcessorNumber",
"switch": "MP",
"comment": "Number of processors",