diff options
| author | Andy Cedilnik <andy.cedilnik@kitware.com> | 2006-03-08 18:59:33 (GMT) |
|---|---|---|
| committer | Andy Cedilnik <andy.cedilnik@kitware.com> | 2006-03-08 18:59:33 (GMT) |
| commit | c14a06c8e0087e649661e9ca445261be59729f0c (patch) | |
| tree | 25e31899b87070beec98accba91145eb2bdbdf41 /Source/CPack | |
| parent | 27b9ab47c20e9adb238315aaf27e9968b5fb101a (diff) | |
| download | CMake-c14a06c8e0087e649661e9ca445261be59729f0c.zip CMake-c14a06c8e0087e649661e9ca445261be59729f0c.tar.gz CMake-c14a06c8e0087e649661e9ca445261be59729f0c.tar.bz2 | |
BUG: Handle version with multiple dots
Diffstat (limited to 'Source/CPack')
| -rw-r--r-- | Source/CPack/cmCPackPackageMakerGenerator.cxx | 4 |
1 files 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("<key>CFBundleShortVersionString</key>"); - cmsys::RegularExpression rexVersion("<string>([0-9]+.[0-9]+)</string>"); + cmsys::RegularExpression rexVersion("<string>([0-9]+.[0-9.]+)</string>"); 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()); |