diff options
author | Brad King <brad.king@kitware.com> | 2008-05-27 18:47:00 (GMT) |
---|---|---|
committer | Brad King <brad.king@kitware.com> | 2008-05-27 18:47:00 (GMT) |
commit | cea66664c561796665bdf2ae74d4b20859f9667d (patch) | |
tree | 5e174c307e18950148d012124938c911607370ea /Source/cmSystemTools.cxx | |
parent | 73d5fd31ab1fe62956b7f2ae8ffffeb3a7281708 (diff) | |
download | CMake-cea66664c561796665bdf2ae74d4b20859f9667d.zip CMake-cea66664c561796665bdf2ae74d4b20859f9667d.tar.gz CMake-cea66664c561796665bdf2ae74d4b20859f9667d.tar.bz2 |
ENH: Added WOW64 key view support to KWSys SystemTools' windows registry API.
- Add an argument to registry read/write/delete methods to specify
a 32-bit or 64-bit view.
- Default is the bit-ness of the running program.
- See issue #7095.
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 6da20fb..4e1f945 100644 --- a/Source/cmSystemTools.cxx +++ b/Source/cmSystemTools.cxx @@ -130,7 +130,7 @@ void* cmSystemTools::s_StdoutCallbackClientData = 0; // replace replace with with as many times as it shows up in source. // write the result into source. #if defined(_WIN32) && !defined(__CYGWIN__) -void cmSystemTools::ExpandRegistryValues(std::string& source) +void cmSystemTools::ExpandRegistryValues(std::string& source, KeyWOW64 view) { // Regular expression to match anything inside [...] that begins in HKEY. // Note that there is a special rule for regular expressions to match a @@ -146,7 +146,7 @@ void cmSystemTools::ExpandRegistryValues(std::string& source) // the arguments are the second match std::string key = regEntry.match(1); std::string val; - if (ReadRegistryValue(key.c_str(), val)) + if (ReadRegistryValue(key.c_str(), val, view)) { std::string reg = "["; reg += key + "]"; @@ -161,7 +161,7 @@ void cmSystemTools::ExpandRegistryValues(std::string& source) } } #else -void cmSystemTools::ExpandRegistryValues(std::string& source) +void cmSystemTools::ExpandRegistryValues(std::string& source, KeyWOW64) { cmsys::RegularExpression regEntry("\\[(HKEY[^]]*)\\]"); while (regEntry.find(source)) |