diff options
| author | Stephen Kelly <steveire@gmail.com> | 2015-04-18 12:50:37 (GMT) |
|---|---|---|
| committer | Stephen Kelly <steveire@gmail.com> | 2015-04-18 13:31:18 (GMT) |
| commit | 6e23a4bdddd2bfee668c682a9ab4081b5e6fcfa2 (patch) | |
| tree | 2b8d5d551944cfecf61c598cb258b402ee3391ce /Source/CPack/cmCPackGenerator.cxx | |
| parent | d21ebcb2444a4b6001c5997f7004bd5cf917d71b (diff) | |
| download | CMake-6e23a4bdddd2bfee668c682a9ab4081b5e6fcfa2.zip CMake-6e23a4bdddd2bfee668c682a9ab4081b5e6fcfa2.tar.gz CMake-6e23a4bdddd2bfee668c682a9ab4081b5e6fcfa2.tar.bz2 | |
cmMakefile: Remove always-null first parameter to ReadListFile.
Diffstat (limited to 'Source/CPack/cmCPackGenerator.cxx')
| -rw-r--r-- | Source/CPack/cmCPackGenerator.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Source/CPack/cmCPackGenerator.cxx b/Source/CPack/cmCPackGenerator.cxx index a2edab5..2b18c41 100644 --- a/Source/CPack/cmCPackGenerator.cxx +++ b/Source/CPack/cmCPackGenerator.cxx @@ -525,7 +525,7 @@ int cmCPackGenerator::InstallProjectViaInstallScript( tempInstallDirectory.c_str()); this->SetOptionIfNotSet("CMAKE_CURRENT_SOURCE_DIR", tempInstallDirectory.c_str()); - int res = this->MakefileMap->ReadListFile(0, installScript.c_str()); + int res = this->MakefileMap->ReadListFile(installScript.c_str()); if ( cmSystemTools::GetErrorOccuredFlag() || !res ) { return 0; @@ -888,7 +888,7 @@ int cmCPackGenerator::InstallProjectViaInstallCMakeProjects( "1"); } // do installation - int res = mf->ReadListFile(0, installFile.c_str()); + int res = mf->ReadListFile(installFile.c_str()); // forward definition of CMAKE_ABSOLUTE_DESTINATION_FILES // to CPack (may be used by generators like CPack RPM or DEB) // in order to transparently handle ABSOLUTE PATH @@ -980,7 +980,7 @@ bool cmCPackGenerator::ReadListFile(const char* moduleName) { bool retval; std::string fullPath = this->MakefileMap->GetModulesFile(moduleName); - retval = this->MakefileMap->ReadListFile(0, fullPath.c_str()); + retval = this->MakefileMap->ReadListFile(fullPath.c_str()); // include FATAL_ERROR and ERROR in the return status retval = retval && (! cmSystemTools::GetErrorOccuredFlag()); return retval; @@ -1163,7 +1163,7 @@ int cmCPackGenerator::Initialize(const std::string& name, cmMakefile* mf) this->GetOption("CPACK_PROJECT_CONFIG_FILE"); if(config) { - mf->ReadListFile(0, config); + mf->ReadListFile(config); } int result = this->InitializeInternal(); if (cmSystemTools::GetErrorOccuredFlag()) |