[Cmake-commits] [cmake-commits] hoffman committed SystemInformation.cxx 1.31 1.32

cmake-commits at cmake.org cmake-commits at cmake.org
Sun Jun 1 16:11:41 EDT 2008


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

Modified Files:
	SystemInformation.cxx 
Log Message:
ENH: fix crash on cygwin


Index: SystemInformation.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/kwsys/SystemInformation.cxx,v
retrieving revision 1.31
retrieving revision 1.32
diff -C 2 -d -r1.31 -r1.32
*** SystemInformation.cxx	1 Jun 2008 18:40:11 -0000	1.31
--- SystemInformation.cxx	1 Jun 2008 20:11:38 -0000	1.32
***************
*** 2187,2191 ****
    // We want to record the total number of cores in this->NumberOfPhysicalCPU
    // (checking only the first proc)
- 
    kwsys_stl::string cores =
                          this->ExtractValueFromCpuInfoFile(buffer,"cpu cores");
--- 2187,2190 ----
***************
*** 2195,2200 ****
  #else // __CYGWIN__
    // does not have "physical id" entries, neither "cpu cores"
!   // this has to be fixed for hyper-threading.
!   this->NumberOfPhysicalCPU=this->NumberOfLogicalCPU;
  #endif
  
--- 2194,2202 ----
  #else // __CYGWIN__
    // does not have "physical id" entries, neither "cpu cores"
!   // this has to be fixed for hyper-threading.  
!   kwsys_stl::string cpucount =
!     this->ExtractValueFromCpuInfoFile(buffer,"cpu count");
!   this->NumberOfPhysicalCPU=
!     this->NumberOfLogicalCPU = atoi(cpucount.c_str());
  #endif
  



More information about the Cmake-commits mailing list