[Cmake-commits] [cmake-commits] hoffman committed cmCPackGenerator.cxx 1.6.2.3 1.6.2.4 cmCPackGenerator.h 1.2.2.2 1.2.2.3 cpack.cxx 1.42.2.1 1.42.2.2

[cmake-commits at cmake.org]

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

Modified Files:
      Tag: CMake-2-6
	cmCPackGenerator.cxx cmCPackGenerator.h cpack.cxx 
Log Message:
STYLE: remove warning from branch


Index: cmCPackGenerator.h
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/CPack/cmCPackGenerator.h,v
retrieving revision 1.2.2.2
retrieving revision 1.2.2.3
diff -C 2 -d -r1.2.2.2 -r1.2.2.3
*** cmCPackGenerator.h	23 Sep 2008 15:32:52 -0000	1.2.2.2
--- cmCPackGenerator.h	24 Sep 2008 14:07:50 -0000	1.2.2.3
***************
*** 74,78 ****
     * Initialize generator
     */
!   int Initialize(const char* name, cmMakefile* mf, const char* argv0);
  
    /**
--- 74,78 ----
     * Initialize generator
     */
!   int Initialize(const char* name, cmMakefile* mf);
  
    /**

Index: cpack.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/CPack/cpack.cxx,v
retrieving revision 1.42.2.1
retrieving revision 1.42.2.2
diff -C 2 -d -r1.42.2.1 -r1.42.2.2
*** cpack.cxx	21 Apr 2008 00:44:53 -0000	1.42.2.1
--- cpack.cxx	24 Sep 2008 14:07:50 -0000	1.42.2.2
***************
*** 383,387 ****
              parsed = 0;
              }
!           if ( parsed && !cpackGenerator->Initialize(gen, mf, argv[0]) )
              {
              cmCPack_Log(&log, cmCPackLog::LOG_ERROR,
--- 383,387 ----
              parsed = 0;
              }
!           if ( parsed && !cpackGenerator->Initialize(gen, mf) )
              {
              cmCPack_Log(&log, cmCPackLog::LOG_ERROR,

Index: cmCPackGenerator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/CPack/cmCPackGenerator.cxx,v
retrieving revision 1.6.2.3
retrieving revision 1.6.2.4
diff -C 2 -d -r1.6.2.3 -r1.6.2.4
*** cmCPackGenerator.cxx	23 Sep 2008 15:32:52 -0000	1.6.2.3
--- cmCPackGenerator.cxx	24 Sep 2008 14:07:49 -0000	1.6.2.4
***************
*** 882,887 ****
  
  //----------------------------------------------------------------------
! int cmCPackGenerator::Initialize(const char* name, cmMakefile* mf,
!  const char* argv0)
  {
    this->MakefileMap = mf;
--- 882,886 ----
  
  //----------------------------------------------------------------------
! int cmCPackGenerator::Initialize(const char* name, cmMakefile* mf)
  {
    this->MakefileMap = mf;