From 9f7f282e5e16b736fdc494b74bffeb0ab42409f7 Mon Sep 17 00:00:00 2001 From: Berk Geveci Date: Wed, 25 Jul 2001 09:40:22 -0400 Subject: [PATCH] Removing trailing spaces after cache entry value. --- Source/cmCacheManager.cxx | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Source/cmCacheManager.cxx b/Source/cmCacheManager.cxx index 0b07b2e8e..289961d9e 100644 --- a/Source/cmCacheManager.cxx +++ b/Source/cmCacheManager.cxx @@ -124,9 +124,9 @@ bool cmCacheManager::LoadCache(const char* path, const int bsize = 4096; char buffer[bsize]; // input line is: key:type=value - cmRegularExpression reg("^([^:]*):([^=]*)=(.*)$"); + cmRegularExpression reg("^([^:]*):([^=]*)=(.*[^\t ]|[\t ]*)[\t ]*$"); // input line is: "key":type=value - cmRegularExpression regQuoted("^\"([^\"]*)\":([^=]*)=(.*)$"); + cmRegularExpression regQuoted("^\"([^\"]*)\":([^=]*)=(.*[^\t ]|[\t ]*)[\t ]*$"); while(fin) { // Format is key:type=value @@ -168,7 +168,8 @@ bool cmCacheManager::LoadCache(const char* path, } else { - cmSystemTools::Error("Parse error in cache file ", cacheFile.c_str()); + cmSystemTools::Error("Parse error in cache file ", cacheFile.c_str(), + ". Offending entry: ", buffer); } } // if CMAKE version not found in the list file