[Cmake-commits] [cmake-commits] hoffman committed cmLocalVisualStudio7Generator.cxx 1.232 1.233

[cmake-commits at cmake.org]

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

Modified Files:
	cmLocalVisualStudio7Generator.cxx 
Log Message:
BUG: fix for 7839 and 4524 


Index: cmLocalVisualStudio7Generator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmLocalVisualStudio7Generator.cxx,v
retrieving revision 1.232
retrieving revision 1.233
diff -C 2 -d -r1.232 -r1.233
*** cmLocalVisualStudio7Generator.cxx	7 Oct 2008 20:23:20 -0000	1.232
--- cmLocalVisualStudio7Generator.cxx	27 Oct 2008 17:51:30 -0000	1.233
***************
*** 1844,1855 ****
      }
    const char* vsProvider = target.GetProperty("VS_SCC_PROVIDER");
-   std::string providerString;
    if (!vsProvider)
      {
!     providerString = "";
!     }
!   else
!     {
!     providerString = "\tSccProvider=\"" + std::string(vsProvider) + "\"\n";
      }
    cmGlobalVisualStudio7Generator* gg =
--- 1844,1850 ----
      }
    const char* vsProvider = target.GetProperty("VS_SCC_PROVIDER");
    if (!vsProvider)
      {
!     vsProvider = "";
      }
    cmGlobalVisualStudio7Generator* gg =
***************
*** 1866,1870 ****
      fout << "\tSccProjectName=\"" << vsProjectname << "\"\n"
           << "\tSccLocalPath=\"" << vsLocalpath << "\"\n"
!          << "\tSccProvider=\"" << providerString << "\"\n";
      }
    fout << "\tKeyword=\"" << keyword << "\">\n"
--- 1861,1865 ----
      fout << "\tSccProjectName=\"" << vsProjectname << "\"\n"
           << "\tSccLocalPath=\"" << vsLocalpath << "\"\n"
!          << "\tSccProvider=\"" << vsProvider << "\"\n";
      }
    fout << "\tKeyword=\"" << keyword << "\">\n"