[Cmake-commits] [cmake-commits] hoffman committed testSystemInformation.cxx 1.2 1.3

[cmake-commits at cmake.org]

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

Modified Files:
	testSystemInformation.cxx 
Log Message:
ENH: fix system info for mac


Index: testSystemInformation.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/kwsys/testSystemInformation.cxx,v
retrieving revision 1.2
retrieving revision 1.3
diff -C 2 -d -r1.2 -r1.3
*** testSystemInformation.cxx	19 Feb 2008 23:50:52 -0000	1.2
--- testSystemInformation.cxx	19 May 2009 20:35:57 -0000	1.3
***************
*** 27,37 ****
  #define printMethod(inof, m) kwsys_ios::cout << #m << ": " \
  << info.m() << "\n"
  int testSystemInformation(int, char*[])
  {
    kwsys::SystemInformation info;
-   printMethod(info, GetVendorString);
    info.RunCPUCheck();
    info.RunOSCheck();
    info.RunMemoryCheck();
    printMethod(info, GetVendorString);
    printMethod(info, GetVendorID);
--- 27,45 ----
  #define printMethod(inof, m) kwsys_ios::cout << #m << ": " \
  << info.m() << "\n"
+ 
+ #define printMethod2(inof, m, unit) kwsys_ios::cout << #m << ": " \
+ << info.m() << " " << unit << "\n"
+ 
  int testSystemInformation(int, char*[])
  {
    kwsys::SystemInformation info;
    info.RunCPUCheck();
    info.RunOSCheck();
    info.RunMemoryCheck();
+   printMethod(info, GetOSName);
+   printMethod(info, GetHostname);
+   printMethod(info, GetOSRelease);
+   printMethod(info, GetOSVersion);
+   printMethod(info, GetOSPlatform);
    printMethod(info, GetVendorString);
    printMethod(info, GetVendorID);
***************
*** 41,62 ****
    printMethod(info, GetExtendedProcessorName);
    printMethod(info, GetProcessorSerialNumber);
!   printMethod(info, GetProcessorCacheSize);
    printMethod(info, GetLogicalProcessorsPerPhysical);
!   printMethod(info, GetProcessorClockFrequency);
!   printMethod(info, GetProcessorAPICID);
!   printMethod(info, GetOSName);
!   printMethod(info, GetHostname);
!   printMethod(info, GetOSRelease);
!   printMethod(info, GetOSVersion);
!   printMethod(info, GetOSPlatform);
    printMethod(info, Is64Bits);
    printMethod(info, GetNumberOfLogicalCPU);
    printMethod(info, GetNumberOfPhysicalCPU);
    printMethod(info, DoesCPUSupportCPUID);
!   printMethod(info, GetTotalVirtualMemory);
!   printMethod(info, GetAvailableVirtualMemory);
!   printMethod(info, GetTotalPhysicalMemory);
!   printMethod(info, GetAvailablePhysicalMemory);
!   
    //int GetProcessorCacheXSize(long int);
  //  bool DoesCPUSupportFeature(long int);
--- 49,65 ----
    printMethod(info, GetExtendedProcessorName);
    printMethod(info, GetProcessorSerialNumber);
!   printMethod2(info, GetProcessorCacheSize, "KB");
    printMethod(info, GetLogicalProcessorsPerPhysical);
!   printMethod2(info, GetProcessorClockFrequency, "MHz");
    printMethod(info, Is64Bits);
    printMethod(info, GetNumberOfLogicalCPU);
    printMethod(info, GetNumberOfPhysicalCPU);
    printMethod(info, DoesCPUSupportCPUID);
!   printMethod(info, GetProcessorAPICID);
!   printMethod2(info, GetTotalVirtualMemory, "MB");
!   printMethod2(info, GetAvailableVirtualMemory, "MB");
!   printMethod2(info, GetTotalPhysicalMemory, "MB");
!   printMethod2(info, GetAvailablePhysicalMemory, "MB");
! 
    //int GetProcessorCacheXSize(long int);
  //  bool DoesCPUSupportFeature(long int);