kolan/CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

STYLE: fix warning and rename method

Browse Source
This commit is contained in:
Bill Hoffman 2008-09-23 10:15:13 -04:00
parent b6d799c407
commit 7fd080d695
2 changed files with 3 additions and 3 deletions

4
Source/CPack/cmCPackGenerator.cxx

@ -886,7 +886,7 @@ int cmCPackGenerator::Initialize(const char* name, cmMakefile* mf,
{ {
this->MakefileMap = mf; this->MakefileMap = mf;
this->Name = name; this->Name = name;
if ( !this->FindRunningCMake(argv0) ) if ( !this->SetCMakeRoot() )
{ {
cmCPackLogger(cmCPackLog::LOG_ERROR, cmCPackLogger(cmCPackLog::LOG_ERROR,
"Cannot initialize the generator" << std::endl); "Cannot initialize the generator" << std::endl);
@ -942,7 +942,7 @@ const char* cmCPackGenerator::GetOption(const char* op)
} }
//---------------------------------------------------------------------- //----------------------------------------------------------------------
int cmCPackGenerator::FindRunningCMake(const char* arg0) int cmCPackGenerator::SetCMakeRoot()
{ {
// use the CMAKE_ROOT from cmake which should have been // use the CMAKE_ROOT from cmake which should have been
// found by now // found by now

2
Source/CPack/cmCPackGenerator.h

@ -88,7 +88,7 @@ public:
bool IsSet(const char* name) const; bool IsSet(const char* name) const;
//! Set all the variables //! Set all the variables
int FindRunningCMake(const char* arg0); int SetCMakeRoot();
//! Set the logger //! Set the logger
void SetLogger(cmCPackLog* log) { this->Logger = log; } void SetLogger(cmCPackLog* log) { this->Logger = log; }