From 697d749c7302992d5dc0cd54d67e4b51a9661909 Mon Sep 17 00:00:00 2001 From: Bill Hoffman Date: Tue, 5 Apr 2005 13:14:50 -0400 Subject: BUG: fix for bug 1660 --- Source/cmGlobalGenerator.cxx | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx index cbf1946..850ef17 100644 --- a/Source/cmGlobalGenerator.cxx +++ b/Source/cmGlobalGenerator.cxx @@ -126,6 +126,11 @@ void cmGlobalGenerator::EnableLanguage(std::vectorconst& languages, for(std::vector::const_iterator l = languages.begin(); l != languages.end(); ++l) { + if(*l == "NONE") + { + this->SetLanguageEnabled("NONE", mf); + continue; + } const char* lang = l->c_str(); std::string src2 = m_ConfiguredFilesPath; src2 += "/CMake"; @@ -196,6 +201,12 @@ void cmGlobalGenerator::EnableLanguage(std::vectorconst& languages, l != languages.end(); ++l) { const char* lang = l->c_str(); + if(*l == "NONE") + { + this->SetLanguageEnabled("NONE", mf); + continue; + } + if(!this->GetLanguageEnabled(lang) ) { if (m_CMakeInstance->GetIsInTryCompile()) @@ -301,6 +312,11 @@ void cmGlobalGenerator::EnableLanguage(std::vectorconst& languages, l != languages.end(); ++l) { const char* lang = l->c_str(); + if(*l == "NONE") + { + this->SetLanguageEnabled("NONE", mf); + continue; + } std::string langLoadedVar = "CMAKE_"; langLoadedVar += lang; langLoadedVar += "_INFORMATION_LOADED"; -- cgit v0.12