[cmake-commits] king committed cmGlobalVisualStudio8Generator.cxx 1.31 1.32

[cmake-commits at cmake.org]

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

Modified Files:
	cmGlobalVisualStudio8Generator.cxx 
Log Message:
BUG: Do not use VSMacros stuff for VS8sp0 because macros do not work in that version.


Index: cmGlobalVisualStudio8Generator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmGlobalVisualStudio8Generator.cxx,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- cmGlobalVisualStudio8Generator.cxx	18 Dec 2007 13:53:10 -0000	1.31
+++ cmGlobalVisualStudio8Generator.cxx	2 Jan 2008 20:53:28 -0000	1.32
@@ -74,6 +74,19 @@
 //----------------------------------------------------------------------------
 std::string cmGlobalVisualStudio8Generator::GetUserMacrosDirectory()
 {
+  // Some VS8 sp0 versions cannot run macros.
+  // See http://support.microsoft.com/kb/928209
+  const char* vc8sp1Registry =
+    "HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VisualStudio\\8.0\\InstalledProducts\\KB926601;";
+  const char* vc8exSP1Registry =
+    "HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VisualStudio\\8.0\\InstalledProducts\\KB926748;";
+  std::string vc8sp1;
+  if (!cmSystemTools::ReadRegistryValue(vc8sp1Registry, vc8sp1) &&
+      !cmSystemTools::ReadRegistryValue(vc8exSP1Registry, vc8sp1))
+    {
+    return "";
+    }
+
   std::string base;
   std::string path;