[Cmake-commits] [cmake-commits] hoffman committed cpack.cxx 1.42 1.42.2.1

[cmake-commits at cmake.org]

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

Modified Files:
      Tag: CMake-2-6
	cpack.cxx 
Log Message:
ENH: merge in from main tree


Index: cpack.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/CPack/cpack.cxx,v
retrieving revision 1.42
retrieving revision 1.42.2.1
diff -C 2 -d -r1.42 -r1.42.2.1
*** cpack.cxx	13 Dec 2007 22:56:49 -0000	1.42
--- cpack.cxx	21 Apr 2008 00:44:53 -0000	1.42.2.1
***************
*** 30,33 ****
--- 30,34 ----
  
  #include <cmsys/CommandLineArguments.hxx>
+ #include <memory> // auto_ptr
  
  //----------------------------------------------------------------------------
***************
*** 223,227 ****
    cmGlobalGenerator cmgg;
    cmgg.SetCMakeInstance(&cminst);
!   cmLocalGenerator* cmlg = cmgg.CreateLocalGenerator();
    cmMakefile* globalMF = cmlg->GetMakefile();
  
--- 224,228 ----
    cmGlobalGenerator cmgg;
    cmgg.SetCMakeInstance(&cminst);
!   std::auto_ptr<cmLocalGenerator> cmlg(cmgg.CreateLocalGenerator());
    cmMakefile* globalMF = cmlg->GetMakefile();