better trycompile and enable langiages

1 files changed, 13 insertions, 18 deletions

diff --git a/Source/cmGlobalVisualStudio6Generator.cxx b/Source/cmGlobalVisualStudio6Generator.cxx
index 79dbba7..9a03c15 100644
--- a/Source/cmGlobalVisualStudio6Generator.cxx
+++ b/Source/cmGlobalVisualStudio6Generator.cxx
@@ -22,25 +22,20 @@
 void cmGlobalVisualStudio6Generator::EnableLanguage(const char*, 
                                                     cmMakefile *mf)
 {
-  if (!m_LanguagesEnabled)
+  // now load the settings
+  if(!mf->GetDefinition("CMAKE_ROOT"))
     {
-    m_LanguagesEnabled = true;
-
-    // now load the settings
-    if(!mf->GetDefinition("CMAKE_ROOT"))
-      {
-      cmSystemTools::Error(
-        "CMAKE_ROOT has not been defined, bad GUI or driver program");
-      return;
-      }
-    if(!this->GetLanguageEnabled("CXX"))
-      {
-      std::string fpath = 
-        mf->GetDefinition("CMAKE_ROOT");
-      fpath += "/Templates/CMakeWindowsSystemConfig.cmake";
-      mf->ReadListFile(NULL,fpath.c_str());
-      this->SetLanguageEnabled("CXX");
-      }
+    cmSystemTools::Error(
+      "CMAKE_ROOT has not been defined, bad GUI or driver program");
+    return;
+    }
+  if(!this->GetLanguageEnabled("CXX"))
+    {
+    std::string fpath = 
+      mf->GetDefinition("CMAKE_ROOT");
+    fpath += "/Templates/CMakeWindowsSystemConfig.cmake";
+    mf->ReadListFile(NULL,fpath.c_str());
+    this->SetLanguageEnabled("CXX");
     }
 }