[cmake-commits] alex committed cmGlobalGenerator.cxx 1.181 1.182

[cmake-commits at cmake.org]

Update of /cvsroot/CMake/CMake/Source
In directory public:/mounts/ram/cvs-serv8635

Modified Files:
	cmGlobalGenerator.cxx 
Log Message:

STYLE: determineLanguageCalled removed, now the conditional code is directly
called in the only place where it could be set to true

Alex


Index: cmGlobalGenerator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmGlobalGenerator.cxx,v
retrieving revision 1.181
retrieving revision 1.182
diff -u -d -r1.181 -r1.182
--- cmGlobalGenerator.cxx	8 Jun 2007 15:57:16 -0000	1.181
+++ cmGlobalGenerator.cxx	11 Jun 2007 18:28:31 -0000	1.182
@@ -268,7 +268,6 @@
       this->SetLanguageEnabled("NONE", mf);
       continue;
       }
-    bool determineLanguageCalled = false;
     std::string loadedLang = "CMAKE_";
     loadedLang +=  lang;
     loadedLang += "_COMPILER_LOADED";
@@ -324,7 +323,6 @@
                              determineFile.c_str());
         }
       needTestLanguage[lang] = true;
-      determineLanguageCalled = true;
       // Some generators like visual studio should not use the env variables
       // So the global generator can specify that in this variable
       if(!mf->GetDefinition("CMAKE_GENERATOR_NO_COMPILER_ENV"))
@@ -346,11 +344,9 @@
         env += envVarValue;
         cmSystemTools::PutEnv(env.c_str());
         }
-      } // end if(!this->GetLanguageEnabled(lang) )
-    // if determineLanguage was called then load the file it
-    // configures CMake(LANG)Compiler.cmake
-    if(determineLanguageCalled)
-      {
+
+      // if determineLanguage was called then load the file it
+      // configures CMake(LANG)Compiler.cmake
       fpath = rootBin;
       fpath += "/CMake";
       fpath += lang;
@@ -366,7 +362,7 @@
       // not know if it is a working compiler yet so set the test language
       // flag
       needTestLanguage[lang] = true;
-      }
+      } // end if(!this->GetLanguageEnabled(lang) )
     }  // end loop over languages
 
   // **** Load the system specific information if not yet loaded