summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Source/cmSystemTools.cxx6
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))