[Cmake-commits] [cmake-commits] hoffman committed cmGlobalGenerator.cxx 1.227.2.8 1.227.2.9 cmLocalVisualStudio7Generator.cxx 1.217.2.12 1.217.2.13

[cmake-commits at cmake.org]

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

Modified Files:
      Tag: CMake-2-6
	cmGlobalGenerator.cxx cmLocalVisualStudio7Generator.cxx 
Log Message:
ENH: merge in fixes from head RC 4


Index: cmLocalVisualStudio7Generator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmLocalVisualStudio7Generator.cxx,v
retrieving revision 1.217.2.12
retrieving revision 1.217.2.13
diff -C 2 -d -r1.217.2.12 -r1.217.2.13
*** cmLocalVisualStudio7Generator.cxx	24 Oct 2008 15:18:52 -0000	1.217.2.12
--- cmLocalVisualStudio7Generator.cxx	11 Nov 2008 21:52:22 -0000	1.217.2.13
***************
*** 1834,1856 ****
      }
    const char* vsProjectname = target.GetProperty("VS_SCC_PROJECTNAME");
-   if (!vsProjectname)
-     {
-     vsProjectname = "";
-     }
    const char* vsLocalpath = target.GetProperty("VS_SCC_LOCALPATH");
-   if (!vsLocalpath)
-     {
-     vsLocalpath = "";
-     }
    const char* vsProvider = target.GetProperty("VS_SCC_PROVIDER");
-   std::string providerString;
-   if (!vsProvider)
-     {
-     providerString = "";
-     }
-   else
-     {
-     providerString = "\tSccProvider=\"" + std::string(vsProvider) + "\"\n";
-     }
    cmGlobalVisualStudio7Generator* gg =
      static_cast<cmGlobalVisualStudio7Generator *>(this->GlobalGenerator);
--- 1834,1839 ----
***************
*** 1866,1870 ****
      fout << "\tSccProjectName=\"" << vsProjectname << "\"\n"
           << "\tSccLocalPath=\"" << vsLocalpath << "\"\n"
!          << "\tSccProvider=\"" << providerString << "\"\n";
      }
    fout << "\tKeyword=\"" << keyword << "\">\n"
--- 1849,1853 ----
      fout << "\tSccProjectName=\"" << vsProjectname << "\"\n"
           << "\tSccLocalPath=\"" << vsLocalpath << "\"\n"
!          << "\tSccProvider=\"" << vsProvider << "\"\n";
      }
    fout << "\tKeyword=\"" << keyword << "\">\n"

Index: cmGlobalGenerator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmGlobalGenerator.cxx,v
retrieving revision 1.227.2.8
retrieving revision 1.227.2.9
diff -C 2 -d -r1.227.2.8 -r1.227.2.9
*** cmGlobalGenerator.cxx	24 Oct 2008 15:18:46 -0000	1.227.2.8
--- cmGlobalGenerator.cxx	11 Nov 2008 21:52:22 -0000	1.227.2.9
***************
*** 1608,1612 ****
      singleLine.push_back("--config");
      configFile = mf->GetStartOutputDirectory();;
!     configFile += "/CPackSourceCConfig.cmake";
      relConfigFile = "./CPackSourceConfig.cmake";
      singleLine.push_back(relConfigFile);
--- 1608,1612 ----
      singleLine.push_back("--config");
      configFile = mf->GetStartOutputDirectory();;
!     configFile += "/CPackSourceConfig.cmake";
      relConfigFile = "./CPackSourceConfig.cmake";
      singleLine.push_back(relConfigFile);