diff options
| author | Brad King <brad.king@kitware.com> | 2020-11-20 15:04:27 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2020-11-20 15:05:11 (GMT) |
| commit | 60a131efd53060b1f95936a0b6160e3b7af994f3 (patch) | |
| tree | aa7c632ad5dc53efec67792123e1710d3a10965b /Source/cmNinjaTargetGenerator.cxx | |
| parent | 8dc3ef670d6b4986b821691c4ec3edd11d714d42 (diff) | |
| parent | 30aa715fac06deba7eaa3e6167cf34eb4d2521d0 (diff) | |
| download | CMake-60a131efd53060b1f95936a0b6160e3b7af994f3.zip CMake-60a131efd53060b1f95936a0b6160e3b7af994f3.tar.gz CMake-60a131efd53060b1f95936a0b6160e3b7af994f3.tar.bz2 | |
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/cmNinjaTargetGenerator.cxx')
| -rw-r--r-- | Source/cmNinjaTargetGenerator.cxx | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/Source/cmNinjaTargetGenerator.cxx b/Source/cmNinjaTargetGenerator.cxx index 17b7efc..6085b25 100644 --- a/Source/cmNinjaTargetGenerator.cxx +++ b/Source/cmNinjaTargetGenerator.cxx @@ -183,16 +183,7 @@ std::string cmNinjaTargetGenerator::ComputeFlagsForObject( } } - 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, language, - "EXPLICIT_LANGUAGE"); - flags += " "; - } - - flags += this->GetFlags(language, config, filterArch); + std::string flags = this->GetFlags(language, config, filterArch); // Add Fortran format flags. if (language == "Fortran") { |