diff options
| author | Sebastien Barre <sebastien.barre@kitware.com> | 2001-05-14 20:47:09 (GMT) |
|---|---|---|
| committer | Sebastien Barre <sebastien.barre@kitware.com> | 2001-05-14 20:47:09 (GMT) |
| commit | 60a8a2f6aaef970aada3474909d122dd4e5ade58 (patch) | |
| tree | 182094f9585e7e431eec8b2afb4eca694ded986e /Source/cmSystemTools.cxx | |
| parent | 5629f84e06565910d76adc287806dca5be303beb (diff) | |
| download | CMake-60a8a2f6aaef970aada3474909d122dd4e5ade58.zip CMake-60a8a2f6aaef970aada3474909d122dd4e5ade58.tar.gz CMake-60a8a2f6aaef970aada3474909d122dd4e5ade58.tar.bz2 | |
Changed separator between registry key and its value. Change regexp for registry key.
Diffstat (limited to 'Source/cmSystemTools.cxx')
| -rw-r--r-- | Source/cmSystemTools.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Source/cmSystemTools.cxx b/Source/cmSystemTools.cxx index 1c37b43..8a0bacf 100644 --- a/Source/cmSystemTools.cxx +++ b/Source/cmSystemTools.cxx @@ -182,7 +182,7 @@ void cmSystemTools::ReplaceString(std::string& source, // Example : // HKEY_LOCAL_MACHINE\SOFTWARE\Python\PythonCore\2.1\InstallPath // => will return the data of the "default" value of the key -// HKEY_LOCAL_MACHINE\SOFTWARE\Scriptics\Tcl\8.4§Root +// HKEY_LOCAL_MACHINE\SOFTWARE\Scriptics\Tcl\8.4;Root // => will return the data of the "Root" value of the key bool ReadAValue(std::string &res, const char *key) { @@ -196,7 +196,7 @@ bool ReadAValue(std::string &res, const char *key) { return false; } - size_t valuenamepos = primary.find("§"); + size_t valuenamepos = primary.find(";"); if (valuenamepos != std::string::npos) { valuename = primary.substr(valuenamepos+1); @@ -256,7 +256,7 @@ bool ReadAValue(std::string &res, const char *key) void cmSystemTools::ExpandRegistryValues(std::string& source) { #if _WIN32 - cmRegularExpression regEntry("\\[(HKEY.*)\\]"); + cmRegularExpression regEntry("\\[(HKEY[A-Za-z0-9_~\\:\\-\\(\\)\\.]*)\\]"); // check for black line or comment while (regEntry.find(source)) |