diff options
| author | Berk Geveci <berk.geveci@kitware.com> | 2001-07-25 13:40:22 (GMT) |
|---|---|---|
| committer | Berk Geveci <berk.geveci@kitware.com> | 2001-07-25 13:40:22 (GMT) |
| commit | 9f7f282e5e16b736fdc494b74bffeb0ab42409f7 (patch) | |
| tree | 8fb76f8abd69e0fb4c0f82d970a64aead9f36556 /Source | |
| parent | ac1112ad06eea51d0ce9b02cdd3c5a8bda8b3db0 (diff) | |
| download | CMake-9f7f282e5e16b736fdc494b74bffeb0ab42409f7.zip CMake-9f7f282e5e16b736fdc494b74bffeb0ab42409f7.tar.gz CMake-9f7f282e5e16b736fdc494b74bffeb0ab42409f7.tar.bz2 | |
Removing trailing spaces after cache entry value.
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmCacheManager.cxx | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/Source/cmCacheManager.cxx b/Source/cmCacheManager.cxx index 0b07b2e..289961d 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 |