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

CPack: don't use else after return

This commit is contained in:
Daniel Pfeifer 2016-08-18 19:47:32 +02:00
parent 4988b914e1
commit 7f97a6c94b
4 changed files with 12 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Source/CPack/cmCPackArchiveGenerator.cxx
View File

@ -231,10 +231,8 @@ int cmCPackArchiveGenerator::PackageFiles()
// There will be 1 package for each component group // There will be 1 package for each component group
// however one may require to ignore component group and // however one may require to ignore component group and
// in this case you'll get 1 package for each component. // in this case you'll get 1 package for each component.
else { return PackageComponents(componentPackageMethod ==
return PackageComponents(componentPackageMethod == ONE_PACKAGE_PER_COMPONENT);
ONE_PACKAGE_PER_COMPONENT);
}
} }
// CASE 3 : NON COMPONENT package. // CASE 3 : NON COMPONENT package.

13
Source/CPack/cmCPackDebGenerator.cxx
View File

@ -242,15 +242,11 @@ int cmCPackDebGenerator::PackageFiles()
// There will be 1 package for each component group // There will be 1 package for each component group
// however one may require to ignore component group and // however one may require to ignore component group and
// in this case you'll get 1 package for each component. // in this case you'll get 1 package for each component.
else { return PackageComponents(componentPackageMethod ==
return PackageComponents(componentPackageMethod == ONE_PACKAGE_PER_COMPONENT);
ONE_PACKAGE_PER_COMPONENT);
}
} }
// CASE 3 : NON COMPONENT package. // CASE 3 : NON COMPONENT package.
else { return PackageComponentsAllInOne("");
return PackageComponentsAllInOne("");
}
} }
int cmCPackDebGenerator::createDeb() int cmCPackDebGenerator::createDeb()
@ -694,9 +690,8 @@ std::string cmCPackDebGenerator::GetComponentInstallDirNameSuffix(
"CPACK_COMPONENT_" + cmSystemTools::UpperCase(componentName) + "_GROUP"; "CPACK_COMPONENT_" + cmSystemTools::UpperCase(componentName) + "_GROUP";
if (CM_NULLPTR != GetOption(groupVar)) { if (CM_NULLPTR != GetOption(groupVar)) {
return std::string(GetOption(groupVar)); return std::string(GetOption(groupVar));
} else {
return componentName;
} }
return componentName;
} }
// The following code is taken from OpenBSD ar: // The following code is taken from OpenBSD ar:

3
Source/CPack/cmCPackGenerator.cxx
View File

@ -67,7 +67,8 @@ int cmCPackGenerator::PrepareNames()
cmCPackLog::LOG_ERROR, "CPACK_SET_DESTDIR is set to ON but the '" cmCPackLog::LOG_ERROR, "CPACK_SET_DESTDIR is set to ON but the '"
<< Name << "' generator does NOT support it." << std::endl); << Name << "' generator does NOT support it." << std::endl);
return 0; return 0;
} else if (SETDESTDIR_SHOULD_NOT_BE_USED == SupportsSetDestdir()) { }
if (SETDESTDIR_SHOULD_NOT_BE_USED == SupportsSetDestdir()) {
cmCPackLogger(cmCPackLog::LOG_WARNING, cmCPackLogger(cmCPackLog::LOG_WARNING,
"CPACK_SET_DESTDIR is set to ON but it is " "CPACK_SET_DESTDIR is set to ON but it is "
<< "usually a bad idea to do that with '" << Name << "usually a bad idea to do that with '" << Name

13
Source/CPack/cmCPackRPMGenerator.cxx
View File

@ -215,15 +215,11 @@ int cmCPackRPMGenerator::PackageFiles()
// There will be 1 package for each component group // There will be 1 package for each component group
// however one may require to ignore component group and // however one may require to ignore component group and
// in this case you'll get 1 package for each component. // in this case you'll get 1 package for each component.
else { return PackageComponents(componentPackageMethod ==
return PackageComponents(componentPackageMethod == ONE_PACKAGE_PER_COMPONENT);
ONE_PACKAGE_PER_COMPONENT);
}
} }
// CASE 3 : NON COMPONENT package. // CASE 3 : NON COMPONENT package.
else { return PackageComponentsAllInOne("");
return PackageComponentsAllInOne("");
}
} }
bool cmCPackRPMGenerator::SupportsComponentInstallation() const bool cmCPackRPMGenerator::SupportsComponentInstallation() const
@ -247,7 +243,6 @@ std::string cmCPackRPMGenerator::GetComponentInstallDirNameSuffix(
"CPACK_COMPONENT_" + cmSystemTools::UpperCase(componentName) + "_GROUP"; "CPACK_COMPONENT_" + cmSystemTools::UpperCase(componentName) + "_GROUP";
if (CM_NULLPTR != GetOption(groupVar)) { if (CM_NULLPTR != GetOption(groupVar)) {
return std::string(GetOption(groupVar)); return std::string(GetOption(groupVar));
} else {
return componentName;
} }
return componentName;
} }