kolan/CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

BUG: fix for bug 1660

Browse Source
This commit is contained in:
Bill Hoffman 2005-04-05 13:14:50 -04:00
parent d74d8aeb71
commit 697d749c73
1 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Source/cmGlobalGenerator.cxx
View File

@ -126,6 +126,11 @@ void cmGlobalGenerator::EnableLanguage(std::vector<std::string>const& languages,
for(std::vector<std::string>::const_iterator l = languages.begin(); for(std::vector<std::string>::const_iterator l = languages.begin();
l != languages.end(); ++l) l != languages.end(); ++l)
{ {
if(*l == "NONE")
{
this->SetLanguageEnabled("NONE", mf);
continue;
}
const char* lang = l->c_str(); const char* lang = l->c_str();
std::string src2 = m_ConfiguredFilesPath; std::string src2 = m_ConfiguredFilesPath;
src2 += "/CMake"; src2 += "/CMake";
@ -196,6 +201,12 @@ void cmGlobalGenerator::EnableLanguage(std::vector<std::string>const& languages,
l != languages.end(); ++l) l != languages.end(); ++l)
{ {
const char* lang = l->c_str(); const char* lang = l->c_str();
if(*l == "NONE")
{
this->SetLanguageEnabled("NONE", mf);
continue;
}
if(!this->GetLanguageEnabled(lang) ) if(!this->GetLanguageEnabled(lang) )
{ {
if (m_CMakeInstance->GetIsInTryCompile()) if (m_CMakeInstance->GetIsInTryCompile())
@ -301,6 +312,11 @@ void cmGlobalGenerator::EnableLanguage(std::vector<std::string>const& languages,
l != languages.end(); ++l) l != languages.end(); ++l)
{ {
const char* lang = l->c_str(); const char* lang = l->c_str();
if(*l == "NONE")
{
this->SetLanguageEnabled("NONE", mf);
continue;
}
std::string langLoadedVar = "CMAKE_"; std::string langLoadedVar = "CMAKE_";
langLoadedVar += lang; langLoadedVar += lang;
langLoadedVar += "_INFORMATION_LOADED"; langLoadedVar += "_INFORMATION_LOADED";