diff options
| author | Brad King <brad.king@kitware.com> | 2015-05-01 17:16:12 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2015-05-01 17:16:12 (GMT) |
| commit | a588d1ee99a2996e0b42b9d7c43e41e3d54b31c8 (patch) | |
| tree | 2d32e037f2722ff9d4e6c84742daa50679b25b95 /Source/cmGlobalGenerator.cxx | |
| parent | c1081a45d52598e6000341595d138048d5b79fc2 (diff) | |
| parent | 27343e3b68e0aa0c923f1ad666575ed40efed211 (diff) | |
| download | CMake-a588d1ee99a2996e0b42b9d7c43e41e3d54b31c8.zip CMake-a588d1ee99a2996e0b42b9d7c43e41e3d54b31c8.tar.gz CMake-a588d1ee99a2996e0b42b9d7c43e41e3d54b31c8.tar.bz2 | |
Merge topic 'fix-cmState-try_compile-languages'
27343e3b cmGlobalGenerator: Finish storing enabled languages in cmState
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 384f023..cf3a037 100644 --- a/Source/cmGlobalGenerator.cxx +++ b/Source/cmGlobalGenerator.cxx @@ -1897,7 +1897,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; |