[Cmake-commits] [cmake-commits] hoffman committed cmCPackGenerator.cxx 1.11 1.12 cmCPackGenerator.h 1.4 1.5
cmake-commits at cmake.org
cmake-commits at cmake.org
Tue Sep 23 10:15:15 EDT 2008
Update of /cvsroot/CMake/CMake/Source/CPack
In directory public:/mounts/ram/cvs-serv19440
Modified Files:
cmCPackGenerator.cxx cmCPackGenerator.h
Log Message:
STYLE: fix warning and rename method
Index: cmCPackGenerator.h
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/CPack/cmCPackGenerator.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C 2 -d -r1.4 -r1.5
*** cmCPackGenerator.h 17 Jun 2008 16:09:42 -0000 1.4
--- cmCPackGenerator.h 23 Sep 2008 14:15:13 -0000 1.5
***************
*** 89,93 ****
//! Set all the variables
! int FindRunningCMake(const char* arg0);
//! Set the logger
--- 89,93 ----
//! Set all the variables
! int SetCMakeRoot();
//! Set the logger
Index: cmCPackGenerator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/CPack/cmCPackGenerator.cxx,v
retrieving revision 1.11
retrieving revision 1.12
diff -C 2 -d -r1.11 -r1.12
*** cmCPackGenerator.cxx 22 Sep 2008 22:12:54 -0000 1.11
--- cmCPackGenerator.cxx 23 Sep 2008 14:15:13 -0000 1.12
***************
*** 887,891 ****
this->MakefileMap = mf;
this->Name = name;
! if ( !this->FindRunningCMake(argv0) )
{
cmCPackLogger(cmCPackLog::LOG_ERROR,
--- 887,891 ----
this->MakefileMap = mf;
this->Name = name;
! if ( !this->SetCMakeRoot() )
{
cmCPackLogger(cmCPackLog::LOG_ERROR,
***************
*** 943,947 ****
//----------------------------------------------------------------------
! int cmCPackGenerator::FindRunningCMake(const char* arg0)
{
// use the CMAKE_ROOT from cmake which should have been
--- 943,947 ----
//----------------------------------------------------------------------
! int cmCPackGenerator::SetCMakeRoot()
{
// use the CMAKE_ROOT from cmake which should have been
More information about the Cmake-commits
mailing list