diff options
| author | Clinton Stimpson <clinton@elemtech.com> | 2011-03-25 16:18:59 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2011-03-31 17:33:03 (GMT) |
| commit | 64a5e209998f12662a56346f855b1973cbbd0440 (patch) | |
| tree | 7c4c071ee6ae358399d0ddfb7ea2b058826d20ca /Source/CPack/cmCPackRPMGenerator.cxx | |
| parent | 148b528f9d7d991dc01f277624df4a8aa41feccc (diff) | |
| download | CMake-64a5e209998f12662a56346f855b1973cbbd0440.zip CMake-64a5e209998f12662a56346f855b1973cbbd0440.tar.gz CMake-64a5e209998f12662a56346f855b1973cbbd0440.tar.bz2 | |
Combine component packaging methods into an enum.
Also allow generators to override the default packaging method.
Add a ONE_PER_GROUP option so that method can be specified by the user without relying on defaults.
Diffstat (limited to 'Source/CPack/cmCPackRPMGenerator.cxx')
| -rw-r--r-- | Source/CPack/cmCPackRPMGenerator.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Source/CPack/cmCPackRPMGenerator.cxx b/Source/CPack/cmCPackRPMGenerator.cxx index c926be6..9f55d23 100644 --- a/Source/CPack/cmCPackRPMGenerator.cxx +++ b/Source/CPack/cmCPackRPMGenerator.cxx @@ -205,7 +205,7 @@ int cmCPackRPMGenerator::PackageFiles() // CASE 1 : COMPONENT ALL-IN-ONE package // If ALL COMPONENTS in ONE package has been requested // then the package file is unique and should be open here. - if (allComponentInOne) + if (componentPackageMethod == ONE_PACKAGE) { return PackageComponentsAllInOne(); } @@ -215,7 +215,7 @@ int cmCPackRPMGenerator::PackageFiles() // in this case you'll get 1 package for each component. else { - return PackageComponents(ignoreComponentGroup); + return PackageComponents(componentPackageMethod == ONE_PACKAGE_PER_COMPONENT); } } // CASE 3 : NON COMPONENT package. @@ -252,11 +252,11 @@ bool cmCPackRPMGenerator::SupportsComponentInstallation() const std::string cmCPackRPMGenerator::GetComponentInstallDirNameSuffix( const std::string& componentName) { - if (ignoreComponentGroup) { + if (componentPackageMethod == ONE_PACKAGE_PER_COMPONENT) { return componentName; } - if (allComponentInOne) { + if (componentPackageMethod == ONE_PACKAGE) { return std::string("ALL_COMPONENTS_IN_ONE"); } // We have to find the name of the COMPONENT GROUP |