summaryrefslogtreecommitdiffstats
path: root/Source/CPack/cmCPackRPMGenerator.cxx
diff options
context:
space:
mode:
authorRose <83477269+AtariDreams@users.noreply.github.com>2021-10-27 18:01:25 (GMT)
committerBrad King <brad.king@kitware.com>2021-11-04 13:20:48 (GMT)
commitb86b6aaa4a27009af4e1457458cf35185be00dc5 (patch)
treed8410f37e0df5aeb59bad57a6ded0961b63f1721 /Source/CPack/cmCPackRPMGenerator.cxx
parent6251239a1c0f0f8342813ff800c184ca2672935b (diff)
downloadCMake-b86b6aaa4a27009af4e1457458cf35185be00dc5.zip
CMake-b86b6aaa4a27009af4e1457458cf35185be00dc5.tar.gz
CMake-b86b6aaa4a27009af4e1457458cf35185be00dc5.tar.bz2
Source: Cleanup and simplify some code
Diffstat (limited to 'Source/CPack/cmCPackRPMGenerator.cxx')
-rw-r--r--Source/CPack/cmCPackRPMGenerator.cxx5
1 files changed, 3 insertions, 2 deletions
diff --git a/Source/CPack/cmCPackRPMGenerator.cxx b/Source/CPack/cmCPackRPMGenerator.cxx
index 9e50700..3d4d05e 100644
--- a/Source/CPack/cmCPackRPMGenerator.cxx
+++ b/Source/CPack/cmCPackRPMGenerator.cxx
@@ -329,9 +329,10 @@ int cmCPackRPMGenerator::PackageComponents(bool ignoreGroup)
if (retval) {
this->AddGeneratedPackageNames();
+ return retval;
}
- return retval;
+ return 0;
}
int cmCPackRPMGenerator::PackageComponentsAllInOne(
@@ -424,7 +425,7 @@ std::string cmCPackRPMGenerator::GetComponentInstallDirNameSuffix(
}
if (this->componentPackageMethod == ONE_PACKAGE) {
- return std::string("ALL_COMPONENTS_IN_ONE");
+ return { "ALL_COMPONENTS_IN_ONE" };
}
// We have to find the name of the COMPONENT GROUP
// the current COMPONENT belongs to.