[cmake-commits] hoffman committed SystemInformation.cxx 1.12 1.13

[cmake-commits at cmake.org]

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

Modified Files:
	SystemInformation.cxx 
Log Message:
ENH: fix win64 build and a warning


Index: SystemInformation.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/kwsys/SystemInformation.cxx,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- SystemInformation.cxx	1 Feb 2008 02:33:32 -0000	1.12
+++ SystemInformation.cxx	1 Feb 2008 16:09:39 -0000	1.13
@@ -801,7 +801,7 @@
 {
   int CPUIDPresent = 0;
 
-#if defined(_MSC_VER) && (_MSC_VER >= 1300)
+#if USE_ASM_INSTRUCTIONS
   // Use SEH to determine CPUID presence
     __try {
         _asm {
@@ -842,7 +842,7 @@
 
 bool SystemInformationImplementation::RetrieveCPUFeatures()
 {
-#if defined(_MSC_VER) && (_MSC_VER >= 1300)
+#if USE_ASM_INSTRUCTIONS
   int localCPUFeatures = 0;
   int localCPUAdvanced = 0;
 
@@ -2761,7 +2761,7 @@
     }
   kwsysProcess_WaitForExit(gp, 0);
 
-  int result = 1;
+  int result = 0;
   switch(kwsysProcess_GetState(gp))
     {
     case kwsysProcess_State_Exited:
@@ -2790,7 +2790,10 @@
       } break;
     }
   kwsysProcess_Delete(gp);
-  (void)result;
+  if(result)
+    {
+    kwsys_ios::cerr << "Error " << args[0] << " returned :" << result << "\n";
+    }
   return buffer;
 }