diff options
| author | Brad King <brad.king@kitware.com> | 2011-04-05 18:28:59 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2011-04-05 18:28:59 (GMT) |
| commit | c90fa7c00c142d42067ce90c07d52c6d489fe815 (patch) | |
| tree | 9298e9136765615428e8a923ce7d7579278c485e /Source/CPack/cmCPackDebGenerator.cxx | |
| parent | e560bf4ba3cf860afe5bc8e23cd6d02dd1c366c1 (diff) | |
| parent | 9c438240661c68da7c0b09b2d08a1facc4fe1dcc (diff) | |
| download | CMake-c90fa7c00c142d42067ce90c07d52c6d489fe815.zip CMake-c90fa7c00c142d42067ce90c07d52c6d489fe815.tar.gz CMake-c90fa7c00c142d42067ce90c07d52c6d489fe815.tar.bz2 | |
Merge topic 'cpack-grouping-enum'
9c43824 Fix KWStyle warnings
64a5e20 Combine component packaging methods into an enum.
Diffstat (limited to 'Source/CPack/cmCPackDebGenerator.cxx')
| -rw-r--r-- | Source/CPack/cmCPackDebGenerator.cxx | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/Source/CPack/cmCPackDebGenerator.cxx b/Source/CPack/cmCPackDebGenerator.cxx index 82038e9..5665404 100644 --- a/Source/CPack/cmCPackDebGenerator.cxx +++ b/Source/CPack/cmCPackDebGenerator.cxx @@ -240,7 +240,7 @@ int cmCPackDebGenerator::PackageFiles() // CASE 1 : COMPONENT ALL-IN-ONE package // If ALL GROUPS or 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(); } @@ -250,7 +250,8 @@ int cmCPackDebGenerator::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. @@ -560,11 +561,11 @@ bool cmCPackDebGenerator::SupportsComponentInstallation() const std::string cmCPackDebGenerator::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 |