From 937f454fb9a8bc962a94f050e5b632d92d5db1b0 Mon Sep 17 00:00:00 2001
From: Brad King <brad.king@kitware.com>
Date: Mon, 26 Jul 2021 10:46:14 -0400
Subject: [PATCH] VS: Remove C++ module CompileAs flag table entries for v142
and v143
The `CompileAs` entry in a `.vcxproj` file with values:
* `CompileAsCppModule` for `-interface`
* `CompileAsCppModuleInternalPartition` for `-internalPartition`
* `CompileAsHeaderUnit` for `-exportHeader`
does not cause the corresponding flag to be added to the command line.
Drop the flag table entries so that the flags go to `AdditionalOptions`.
Fixes: #22477
---
Templates/MSBuild/FlagTables/v142_CL.json | 21 ---------------------
Templates/MSBuild/FlagTables/v143_CL.json | 21 ---------------------
2 files changed, 42 deletions(-)
diff --git a/Templates/MSBuild/FlagTables/v142_CL.json b/Templates/MSBuild/FlagTables/v142_CL.json
index 08b645925f9..64eeac4ab3f 100644
--- a/Templates/MSBuild/FlagTables/v142_CL.json
+++ b/Templates/MSBuild/FlagTables/v142_CL.json
@@ -663,27 +663,6 @@
"value": "CompileAsCpp",
"flags": []
},
- {
- "name": "CompileAs",
- "switch": "interface",
- "comment": "Compile as C++ Module Code",
- "value": "CompileAsCppModule",
- "flags": []
- },
- {
- "name": "CompileAs",
- "switch": "internalPartition",
- "comment": "Compile as C++ Module Internal Partition",
- "value": "CompileAsCppModuleInternalPartition",
- "flags": []
- },
- {
- "name": "CompileAs",
- "switch": "exportHeader",
- "comment": "Compile as C++ Header Unit",
- "value": "CompileAsHeaderUnit",
- "flags": []
- },
{
"name": "ErrorReporting",
"switch": "errorReport:none",
diff --git a/Templates/MSBuild/FlagTables/v143_CL.json b/Templates/MSBuild/FlagTables/v143_CL.json
index ad7194b8fce..8b700aafb3e 100644
--- a/Templates/MSBuild/FlagTables/v143_CL.json
+++ b/Templates/MSBuild/FlagTables/v143_CL.json
@@ -658,27 +658,6 @@
"value": "CompileAsCpp",
"flags": []
},
- {
- "name": "CompileAs",
- "switch": "interface",
- "comment": "Compile as C++ Module Code",
- "value": "CompileAsCppModule",
- "flags": []
- },
- {
- "name": "CompileAs",
- "switch": "internalPartition",
- "comment": "Compile as C++ Module Internal Partition",
- "value": "CompileAsCppModuleInternalPartition",
- "flags": []
- },
- {
- "name": "CompileAs",
- "switch": "exportHeader",
- "comment": "Compile as C++ Header Unit",
- "value": "CompileAsHeaderUnit",
- "flags": []
- },
{
"name": "ErrorReporting",
"switch": "errorReport:none",
--
GitLab