diff options
| author | Brad King <brad.king@kitware.com> | 2020-11-20 15:04:27 +0000 |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2020-11-20 10:05:11 -0500 |
| commit | 60a131efd53060b1f95936a0b6160e3b7af994f3 (patch) | |
| tree | aa7c632ad5dc53efec67792123e1710d3a10965b /Source/cmMakefileTargetGenerator.cxx | |
| parent | 8dc3ef670d6b4986b821691c4ec3edd11d714d42 (diff) | |
| parent | 30aa715fac06deba7eaa3e6167cf34eb4d2521d0 (diff) | |
| download | cmake-60a131efd53060b1f95936a0b6160e3b7af994f3.tar.gz | |
Merge topic 'revert-explicit-LANGUAGE-flag'
30aa715fac Revert "specify language flag when source LANGUAGE property is set"
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5519
Diffstat (limited to 'Source/cmMakefileTargetGenerator.cxx')
| -rw-r--r-- | Source/cmMakefileTargetGenerator.cxx | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/Source/cmMakefileTargetGenerator.cxx b/Source/cmMakefileTargetGenerator.cxx index 8f3a0d8cba..f0d464ebb7 100644 --- a/Source/cmMakefileTargetGenerator.cxx +++ b/Source/cmMakefileTargetGenerator.cxx @@ -573,13 +573,6 @@ void cmMakefileTargetGenerator::WriteObjectRuleFiles( // Build the set of compiler flags. std::string flags; - // explicitly add the explicit language flag before any other flag - // this way backwards compatibility with user flags is maintained - if (source.GetProperty("LANGUAGE")) { - this->LocalGenerator->AppendFeatureOptions(flags, lang, - "EXPLICIT_LANGUAGE"); - } - // Add language-specific flags. std::string langFlags = cmStrCat("$(", lang, "_FLAGS", filterArch, ")"); this->LocalGenerator->AppendFlags(flags, langFlags); |