diff options
| author | Bill Hoffman <bill.hoffman@kitware.com> | 2005-04-05 17:14:50 (GMT) |
|---|---|---|
| committer | Bill Hoffman <bill.hoffman@kitware.com> | 2005-04-05 17:14:50 (GMT) |
| commit | 697d749c7302992d5dc0cd54d67e4b51a9661909 (patch) | |
| tree | ca68bbb1fcc4ee04abcc2d91884ae1d40974e711 /Source | |
| parent | d74d8aeb719a6af1563c5deb59615649ec1528e5 (diff) | |
| download | CMake-697d749c7302992d5dc0cd54d67e4b51a9661909.zip CMake-697d749c7302992d5dc0cd54d67e4b51a9661909.tar.gz CMake-697d749c7302992d5dc0cd54d67e4b51a9661909.tar.bz2 | |
BUG: fix for bug 1660
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmGlobalGenerator.cxx | 16 |
1 files changed, 16 insertions, 0 deletions
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::vector<std::string>const& languages, for(std::vector<std::string>::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::vector<std::string>const& 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::vector<std::string>const& 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"; |