[Cmake-commits] [cmake-commits] hoffman committed cmSystemTools.cxx 1.372 1.373

cmake-commits at cmake.org cmake-commits at cmake.org
Tue Apr 8 16:06:46 EDT 2008


Update of /cvsroot/CMake/CMake/Source
In directory public:/mounts/ram/cvs-serv17766

Modified Files:
	cmSystemTools.cxx 
Log Message:
BUG: half fix for 6688, expand registry stuff on unix just like it was not found on windows


Index: cmSystemTools.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmSystemTools.cxx,v
retrieving revision 1.372
retrieving revision 1.373
diff -C 2 -d -r1.372 -r1.373
*** cmSystemTools.cxx	8 Apr 2008 20:05:23 -0000	1.372
--- cmSystemTools.cxx	8 Apr 2008 20:06:44 -0000	1.373
***************
*** 150,155 ****
  }
  #else
! void cmSystemTools::ExpandRegistryValues(std::string&)
  {
  }
  #endif
--- 150,166 ----
  }
  #else
! void cmSystemTools::ExpandRegistryValues(std::string& source)
  {
+   cmsys::RegularExpression regEntry("\\[(HKEY[^]]*)\\]");
+   while (regEntry.find(source))
+     {
+     // the arguments are the second match
+     std::string key = regEntry.match(1);
+     std::string val;
+     std::string reg = "[";
+     reg += key + "]";
+     cmSystemTools::ReplaceString(source, reg.c_str(), "/registry");
+     }
+ 
  }
  #endif



More information about the Cmake-commits mailing list