kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Changed separator between registry key and its value. Change regexp for registry key.

This commit is contained in:
Sebastien Barre 2001-05-14 16:47:09 -04:00
parent 5629f84e06
commit 60a8a2f6aa
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Source/cmSystemTools.cxx
View File

@ -182,7 +182,7 @@ void cmSystemTools::ReplaceString(std::string& source,
// Example : // Example :
// HKEY_LOCAL_MACHINE\SOFTWARE\Python\PythonCore\2.1\InstallPath // HKEY_LOCAL_MACHINE\SOFTWARE\Python\PythonCore\2.1\InstallPath
// => will return the data of the "default" value of the key // => 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 // => will return the data of the "Root" value of the key
bool ReadAValue(std::string &res, const char *key) bool ReadAValue(std::string &res, const char *key)
{ {
@ -196,7 +196,7 @@ bool ReadAValue(std::string &res, const char *key)
{ {
return false; return false;
} }
size_t valuenamepos = primary.find("§"); size_t valuenamepos = primary.find(";");
if (valuenamepos != std::string::npos) if (valuenamepos != std::string::npos)
{ {
valuename = primary.substr(valuenamepos+1); valuename = primary.substr(valuenamepos+1);
@ -256,7 +256,7 @@ bool ReadAValue(std::string &res, const char *key)
void cmSystemTools::ExpandRegistryValues(std::string& source) void cmSystemTools::ExpandRegistryValues(std::string& source)
{ {
#if _WIN32 #if _WIN32
cmRegularExpression regEntry("\\[(HKEY.*)\\]"); cmRegularExpression regEntry("\\[(HKEY[A-Za-z0-9_~\\:\\-\\(\\)\\.]*)\\]");
// check for black line or comment // check for black line or comment
while (regEntry.find(source)) while (regEntry.find(source))