kolan/CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

BUG: Handle version with multiple dots

Browse Source
This commit is contained in:
Andy Cedilnik 2006-03-08 13:59:33 -05:00
parent 27b9ab47c2
commit c14a06c8e0
1 changed files with 2 additions and 2 deletions

4
Source/CPack/cmCPackPackageMakerGenerator.cxx

@ -143,7 +143,7 @@ int cmCPackPackageMakerGenerator::Initialize(const char* name, cmMakefile* mf)
} }
// Check the PackageMaker version // Check the PackageMaker version
cmsys::RegularExpression rexKey("<key>CFBundleShortVersionString</key>"); cmsys::RegularExpression rexKey("<key>CFBundleShortVersionString</key>");
cmsys::RegularExpression rexVersion("<string>([0-9]+.[0-9]+)</string>"); cmsys::RegularExpression rexVersion("<string>([0-9]+.[0-9.]+)</string>");
std::string line; std::string line;
bool foundKey = false; bool foundKey = false;
while ( cmSystemTools::GetLineFromStream(ifs, line) ) while ( cmSystemTools::GetLineFromStream(ifs, line) )
@ -161,7 +161,7 @@ int cmCPackPackageMakerGenerator::Initialize(const char* name, cmMakefile* mf)
} }
if ( !cmSystemTools::GetLineFromStream(ifs, line) || !rexVersion.find(line) ) if ( !cmSystemTools::GetLineFromStream(ifs, line) || !rexVersion.find(line) )
{ {
cmCPackLogger(cmCPackLog::LOG_ERROR, "Problem reading the PackageMaker compiler version file" << std::endl); cmCPackLogger(cmCPackLog::LOG_ERROR, "Problem reading the PackageMaker compiler version file: " << versionFile.c_str() << std::endl);
return 0; return 0;
} }
this->PackageMakerVersion = atof(rexVersion.match(1).c_str()); this->PackageMakerVersion = atof(rexVersion.match(1).c_str());