diff options
Diffstat (limited to 'Source/CPack/cmCPackGenericGenerator.cxx')
| -rw-r--r-- | Source/CPack/cmCPackGenericGenerator.cxx | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/Source/CPack/cmCPackGenericGenerator.cxx b/Source/CPack/cmCPackGenericGenerator.cxx index 0a19921..06f2b00 100644 --- a/Source/CPack/cmCPackGenericGenerator.cxx +++ b/Source/CPack/cmCPackGenericGenerator.cxx @@ -32,14 +32,14 @@ cmCPackGenericGenerator::cmCPackGenericGenerator() { this->GeneratorVerbose = false; - this->MakefileMap = 0; + this->Makefile = 0; this->Logger = 0; } //---------------------------------------------------------------------- cmCPackGenericGenerator::~cmCPackGenericGenerator() { - this->MakefileMap = 0; + this->Makefile = 0; } //---------------------------------------------------------------------- @@ -392,7 +392,7 @@ int cmCPackGenericGenerator::InstallProjectViaInstallScript( tempInstallDirectory); this->SetOptionIfNotSet("CMAKE_CURRENT_SOURCE_DIR", tempInstallDirectory); - int res = this->MakefileMap->ReadListFile(0, installScript.c_str()); + int res = this->Makefile->ReadListFile(0, installScript.c_str()); if ( cmSystemTools::GetErrorOccuredFlag() || !res ) { return 0; @@ -454,7 +454,7 @@ int cmCPackGenericGenerator::InstallProjectViaInstallCMakeProjects( const char* buildConfig = this->GetOption("CPACK_BUILD_CONFIG"); cmGlobalGenerator* globalGenerator - = this->MakefileMap->GetCMakeInstance()->CreateGlobalGenerator( + = this->Makefile->GetCMakeInstance()->CreateGlobalGenerator( cmakeGenerator); // set the global flag for unix style paths on cmSystemTools as // soon as the generator is set. This allows gmake to be used @@ -464,9 +464,9 @@ int cmCPackGenericGenerator::InstallProjectViaInstallCMakeProjects( // Does this generator require pre-install? if ( globalGenerator->GetPreinstallTargetName() ) { - globalGenerator->FindMakeProgram(this->MakefileMap); + globalGenerator->FindMakeProgram(this->Makefile); const char* cmakeMakeProgram - = this->MakefileMap->GetDefinition("CMAKE_MAKE_PROGRAM"); + = this->Makefile->GetDefinition("CMAKE_MAKE_PROGRAM"); std::string buildCommand = globalGenerator->GenerateBuildCommand(cmakeMakeProgram, installProjectName.c_str(), 0, @@ -554,7 +554,7 @@ int cmCPackGenericGenerator::InstallProjectViaInstallCMakeProjects( void cmCPackGenericGenerator::SetOptionIfNotSet(const char* op, const char* value) { - const char* def = this->MakefileMap->GetDefinition(op); + const char* def = this->Makefile->GetDefinition(op); if ( def && *def ) { return; @@ -571,12 +571,12 @@ void cmCPackGenericGenerator::SetOption(const char* op, const char* value) } if ( !value ) { - this->MakefileMap->RemoveDefinition(op); + this->Makefile->RemoveDefinition(op); return; } cmCPackLogger(cmCPackLog::LOG_DEBUG, this->GetNameOfClass() << "::SetOption(" << op << ", " << value << ")" << std::endl); - this->MakefileMap->AddDefinition(op, value); + this->Makefile->AddDefinition(op, value); } //---------------------------------------------------------------------- @@ -680,7 +680,7 @@ int cmCPackGenericGenerator::ProcessGenerator() int cmCPackGenericGenerator::Initialize(const char* name, cmMakefile* mf, const char* argv0) { - this->MakefileMap = mf; + this->Makefile = mf; this->Name = name; if ( !this->FindRunningCMake(argv0) ) { @@ -700,7 +700,7 @@ int cmCPackGenericGenerator::InitializeInternal() //---------------------------------------------------------------------- const char* cmCPackGenericGenerator::GetOption(const char* op) { - return this->MakefileMap->GetDefinition(op); + return this->Makefile->GetDefinition(op); } //---------------------------------------------------------------------- @@ -913,7 +913,7 @@ std::string cmCPackGenericGenerator::FindTemplate(const char* name) { cmCPackLogger(cmCPackLog::LOG_DEBUG, "Look for template: " << (name ? name : "(NULL)") << std::endl); - std::string ffile = this->MakefileMap->GetModulesFile(name); + std::string ffile = this->Makefile->GetModulesFile(name); cmCPackLogger(cmCPackLog::LOG_DEBUG, "Found template: " << ffile.c_str() << std::endl); return ffile; @@ -923,7 +923,7 @@ std::string cmCPackGenericGenerator::FindTemplate(const char* name) bool cmCPackGenericGenerator::ConfigureString(const std::string& inString, std::string& outString) { - this->MakefileMap->ConfigureString(inString, + this->Makefile->ConfigureString(inString, outString, true, false); return true; } @@ -932,7 +932,7 @@ bool cmCPackGenericGenerator::ConfigureString(const std::string& inString, bool cmCPackGenericGenerator::ConfigureFile(const char* inName, const char* outName, bool copyOnly /* = false */) { - return this->MakefileMap->ConfigureFile(inName, outName, + return this->Makefile->ConfigureFile(inName, outName, copyOnly, true, false) == 1; } |