Merge topic 'cpack-one-component-only'

ed0b0630 CPack: Fix single component packaging
This commit is contained in:
Brad King 2015-04-17 10:50:15 -04:00 committed by CMake Topic Stage
commit 1f1b62b0e2
1 changed files with 2 additions and 2 deletions

View File

@ -1501,8 +1501,8 @@ bool cmCPackGenerator::WantsComponentInstallation() const
{
return (!IsOn("CPACK_MONOLITHIC_INSTALL")
&& SupportsComponentInstallation()
// check that package at least has components
&& !(this->ComponentGroups.empty() || this->Components.empty()));
// check that we have at least one group or component
&& (!this->ComponentGroups.empty() || !this->Components.empty()));
}
//----------------------------------------------------------------------