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

CPackRPM Replace space in some CPACK_ vars (Fix bug 9932)

This commit is contained in:
Eric NOULARD 2011-02-25 16:47:11 +01:00
parent 307bdadadc
commit 5b4cbdb45e
1 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Source/CPack/cmCPackRPMGenerator.cxx
View File

@ -31,6 +31,21 @@ int cmCPackRPMGenerator::InitializeInternal()
{ {
this->SetOption("CPACK_SET_DESTDIR", "I_ON"); this->SetOption("CPACK_SET_DESTDIR", "I_ON");
} }
/* Replace space in CPACK_PACKAGE_NAME in order to avoid
* rpmbuild scream on unwanted space in filename issue
* Moreover RPM file do not usually embed space in filename
*/
if (this->GetOption("CPACK_PACKAGE_NAME")) {
std::string packageName=this->GetOption("CPACK_PACKAGE_NAME");
cmSystemTools::ReplaceString(packageName," ","-");
this->SetOption("CPACK_PACKAGE_NAME",packageName.c_str());
}
/* same for CPACK_PACKAGE_FILE_NAME */
if (this->GetOption("CPACK_PACKAGE_FILE_NAME")) {
std::string packageName=this->GetOption("CPACK_PACKAGE_FILE_NAME");
cmSystemTools::ReplaceString(packageName," ","-");
this->SetOption("CPACK_PACKAGE_FILE_NAME",packageName.c_str());
}
return this->Superclass::InitializeInternal(); return this->Superclass::InitializeInternal();
} }