diff options
| author | Brad King <brad.king@kitware.com> | 2015-04-30 12:56:48 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2015-04-30 13:08:25 (GMT) |
| commit | 27343e3b68e0aa0c923f1ad666575ed40efed211 (patch) | |
| tree | add7cd98b056ce82feb5d47e2dc9cc5a3629fae0 /Source/cmGlobalGenerator.cxx | |
| parent | 8469b6f6941ec8afe30f6c5a94f045e596bfe22a (diff) | |
| download | CMake-27343e3b68e0aa0c923f1ad666575ed40efed211.zip CMake-27343e3b68e0aa0c923f1ad666575ed40efed211.tar.gz CMake-27343e3b68e0aa0c923f1ad666575ed40efed211.tar.bz2 | |
cmGlobalGenerator: Finish storing enabled languages in cmState
In commit 74de9a73 (cmGlobalGenerator: Delegate storage of enabled
languages to cmState, 2015-04-11) the original LanguageEnabled
member of cmGlobalGenerator was left behind by mistake. One use
of it in EnableLanguagesFromGenerator (for try_compile) was left,
but the member is not populated anymore. Drop the member and
teach EnableLanguagesFromGenerator to copy the list of enabled
languages from one cmState to the other.
Reported-by: Matt McCormick <matt.mccormick@kitware.com>
Diffstat (limited to 'Source/cmGlobalGenerator.cxx')
| -rw-r--r-- | Source/cmGlobalGenerator.cxx | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx index ab044c1..243f61a 100644 --- a/Source/cmGlobalGenerator.cxx +++ b/Source/cmGlobalGenerator.cxx @@ -1896,7 +1896,9 @@ void cmGlobalGenerator::EnableLanguagesFromGenerator(cmGlobalGenerator *gen, "make program", cmState::FILEPATH); // copy the enabled languages - this->LanguageEnabled = gen->LanguageEnabled; + this->GetCMakeInstance()->GetState()->SetEnabledLanguages( + gen->GetCMakeInstance()->GetState()->GetEnabledLanguages() + ); this->LanguagesReady = gen->LanguagesReady; this->ExtensionToLanguage = gen->ExtensionToLanguage; this->IgnoreExtensions = gen->IgnoreExtensions; |