From c14a06c8e0087e649661e9ca445261be59729f0c Mon Sep 17 00:00:00 2001 From: Andy Cedilnik Date: Wed, 8 Mar 2006 13:59:33 -0500 Subject: BUG: Handle version with multiple dots --- Source/CPack/cmCPackPackageMakerGenerator.cxx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Source/CPack/cmCPackPackageMakerGenerator.cxx b/Source/CPack/cmCPackPackageMakerGenerator.cxx index 8b1e59b..d809814 100644 --- a/Source/CPack/cmCPackPackageMakerGenerator.cxx +++ b/Source/CPack/cmCPackPackageMakerGenerator.cxx @@ -143,7 +143,7 @@ int cmCPackPackageMakerGenerator::Initialize(const char* name, cmMakefile* mf) } // Check the PackageMaker version cmsys::RegularExpression rexKey("CFBundleShortVersionString"); - cmsys::RegularExpression rexVersion("([0-9]+.[0-9]+)"); + cmsys::RegularExpression rexVersion("([0-9]+.[0-9.]+)"); std::string line; bool foundKey = false; 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) ) { - 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; } this->PackageMakerVersion = atof(rexVersion.match(1).c_str()); -- cgit v0.12