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/cmGlobalXCodeGenerator.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/cmGlobalXCodeGenerator.cxx')
| -rw-r--r-- | Source/cmGlobalXCodeGenerator.cxx | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx index 026e96c..0d41b98 100644 --- a/Source/cmGlobalXCodeGenerator.cxx +++ b/Source/cmGlobalXCodeGenerator.cxx @@ -936,14 +936,6 @@ cmXCodeObject* cmGlobalXCodeGenerator::CreateXCodeSourceFile( default: break; } - - // explicitly add the explicit language flag before any other flag - // this way backwards compatibility with user flags is maintained - if (sf->GetProperty("LANGUAGE")) { - this->CurrentLocalGenerator->AppendFeatureOptions(flags, lang, - "EXPLICIT_LANGUAGE"); - } - const std::string COMPILE_FLAGS("COMPILE_FLAGS"); if (cmProp cflags = sf->GetProperty(COMPILE_FLAGS)) { lg->AppendFlags(flags, genexInterpreter.Evaluate(*cflags, COMPILE_FLAGS)); |