--- cmake-2.8.0/Source/cmCoreTryCompile.cxx	cmake-2.8.0/Source/cmCoreTryCompile.cxx#1
+++ cmake-2.8.0/Source/cmCoreTryCompile.cxx	2010-05-11 15:41:37
@@ -175,6 +175,27 @@ int cmCoreTryCompile::TryCompileCode(std
       {
       fprintf(fout, "SET(CMAKE_MODULE_PATH %s)\n", def);
       }
+
+    const char* rulesOverrideBase = "CMAKE_USER_MAKE_RULES_OVERRIDE";
+    std::string rulesOverrideLang = rulesOverrideBase + (lang ? std::string("_") + lang : "");
+
+    const char* rulesOverridePath = this->Makefile
+                                ->GetDefinition(rulesOverrideLang.c_str());
+    if(rulesOverridePath)
+      {
+      fprintf(fout, "SET(%s %s)\n", 
+          rulesOverrideLang.c_str(), rulesOverridePath);
+      }
+    else
+      {
+      rulesOverridePath = this->Makefile->GetDefinition(rulesOverrideBase);
+      if(rulesOverridePath)
+        {
+          fprintf(fout, "SET(%s %s)\n", rulesOverrideBase, rulesOverridePath);
+        }
+      }
+    
+
     if(lang)
       {
       fprintf(fout, "PROJECT(CMAKE_TRY_COMPILE %s)\n", lang);
--- cmake-2.8.0/Source/cmVisualStudioGeneratorOptions.cxx	cmake-2.8.0/Source/cmVisualStudioGeneratorOptions.cxx#1
+++ cmake-2.8.0/Source/cmVisualStudioGeneratorOptions.cxx	2010-06-03 14:59:06
@@ -209,14 +209,7 @@ cmVisualStudioGeneratorOptions
       }
     // Store the flag in the project file.
     fout << comma << define;
-    if(this->Version == 10)
-      {
-      comma = ";";
-      }
-    else
-      {
-      comma = ",";
-      }
+    comma = ";";
     }
   if(this->Version == 10)
     {