[Cmake-commits] [cmake-commits] hoffman committed cmCacheManager.cxx 1.101 1.102
cmake-commits at cmake.org
cmake-commits at cmake.org
Mon Feb 9 08:25:57 EST 2009
Update of /cvsroot/CMake/CMake/Source
In directory public:/mounts/ram/cvs-serv27869
Modified Files:
cmCacheManager.cxx
Log Message:
BUG: fix for 0008378, lists with FILEPATH and UNC //server/path fail
Index: cmCacheManager.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmCacheManager.cxx,v
retrieving revision 1.101
retrieving revision 1.102
diff -C 2 -d -r1.101 -r1.102
*** cmCacheManager.cxx 25 Aug 2008 14:31:28 -0000 1.101
--- cmCacheManager.cxx 9 Feb 2009 13:25:55 -0000 1.102
***************
*** 785,789 ****
if(type == FILEPATH || type == PATH)
{
! cmSystemTools::ConvertToUnixSlashes(e.Value);
}
if ( helpString )
--- 785,806 ----
if(type == FILEPATH || type == PATH)
{
! if(e.Value.find(';') != e.Value.npos)
! {
! std::vector<std::string> paths;
! cmSystemTools::ExpandListArgument(e.Value, paths);
! const char* sep = "";
! for(std::vector<std::string>::iterator i = paths.begin();
! i != paths.end(); ++i)
! {
! cmSystemTools::ConvertToUnixSlashes(*i);
! e.Value += sep;
! e.Value += *i;
! sep = ";";
! }
! }
! else
! {
! cmSystemTools::ConvertToUnixSlashes(e.Value);
! }
}
if ( helpString )
More information about the Cmake-commits
mailing list