summaryrefslogtreecommitdiffstats
path: root/Source
diff options
context:
space:
mode:
authorEric NOULARD <eric.noulard@gmail.com>2011-02-25 15:47:11 (GMT)
committerEric NOULARD <eric.noulard@gmail.com>2011-02-25 15:47:11 (GMT)
commit5b4cbdb45e1f0efb2c55b29a4ca2521f38e88f96 (patch)
treed5de36874e9fc9b3f5521babfb78dc527a4c6a2a /Source
parent307bdadadc9b6ea57e0df76ec81168ef4b81b636 (diff)
downloadCMake-5b4cbdb45e1f0efb2c55b29a4ca2521f38e88f96.zip
CMake-5b4cbdb45e1f0efb2c55b29a4ca2521f38e88f96.tar.gz
CMake-5b4cbdb45e1f0efb2c55b29a4ca2521f38e88f96.tar.bz2
CPackRPM Replace space in some CPACK_ vars (Fix bug 9932)
Diffstat (limited to 'Source')
-rw-r--r--Source/CPack/cmCPackRPMGenerator.cxx15
1 files changed, 15 insertions, 0 deletions
diff --git a/Source/CPack/cmCPackRPMGenerator.cxx b/Source/CPack/cmCPackRPMGenerator.cxx
index 2d675c1..cc50580 100644
--- a/Source/CPack/cmCPackRPMGenerator.cxx
+++ b/Source/CPack/cmCPackRPMGenerator.cxx
@@ -31,6 +31,21 @@ int cmCPackRPMGenerator::InitializeInternal()
{
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();
}