diff --git a/SystemInformation.cxx b/SystemInformation.cxx index f3150ea07f3a828695028227432cfffa243b600b..89fdf9b50868a675437221bc24a2f19123df2456 100644 --- a/SystemInformation.cxx +++ b/SystemInformation.cxx @@ -243,6 +243,7 @@ protected: // For Mac bool ParseSysCtl(); void CallSwVers(); + void TrimNewline(kwsys_stl::string&); kwsys_stl::string ExtractValueFromSysCtl(const char* word); kwsys_stl::string SysCtlBuffer; @@ -3390,6 +3391,7 @@ void SystemInformationImplementation::CallSwVers() args.push_back("-productName"); args.push_back(0); output = this->RunProcess(args); + this->TrimNewline(output); this->OSName = output; args.clear(); @@ -3397,6 +3399,7 @@ void SystemInformationImplementation::CallSwVers() args.push_back("-productVersion"); args.push_back(0); output = this->RunProcess(args); + this->TrimNewline(output); this->OSRelease = output; args.clear(); @@ -3404,10 +3407,28 @@ void SystemInformationImplementation::CallSwVers() args.push_back("-buildVersion"); args.push_back(0); output = this->RunProcess(args); + this->TrimNewline(output); this->OSVersion = output; #endif } +void SystemInformationImplementation::TrimNewline(kwsys_stl::string& output) +{ + // remove \r + kwsys_stl::string::size_type pos=0; + while((pos = output.find("\r", pos)) != kwsys_stl::string::npos) + { + output.erase(pos); + } + + // remove \n + pos = 0; + while((pos = output.find("\n", pos)) != kwsys_stl::string::npos) + { + output.erase(pos); + } +} + /** Return true if the machine is 64 bits */ bool SystemInformationImplementation::Is64Bits() { diff --git a/kwsysDateStamp.cmake b/kwsysDateStamp.cmake index 780dd21d411a9b38057713e79ea7f3758d51efd8..3dbad174a205c2aa5f8d2476df5587db84ee13eb 100644 --- a/kwsysDateStamp.cmake +++ b/kwsysDateStamp.cmake @@ -18,4 +18,4 @@ SET(KWSYS_DATE_STAMP_YEAR 2009) SET(KWSYS_DATE_STAMP_MONTH 10) # KWSys version date day component. Format is DD. -SET(KWSYS_DATE_STAMP_DAY 06) +SET(KWSYS_DATE_STAMP_DAY 08)