diff options
| author | Brad King <brad.king@kitware.com> | 2015-04-17 14:50:15 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2015-04-17 14:50:15 (GMT) |
| commit | 1f1b62b0e2598554349dce14542a4c383f620ada (patch) | |
| tree | f5ca40857416de5daec36f7a016ac4add878ab1e /Source | |
| parent | 9efee16a7a092555d4bc40498a1acd957943a834 (diff) | |
| parent | ed0b06308523e56f6df5de9abdb5211e908ce772 (diff) | |
| download | CMake-1f1b62b0e2598554349dce14542a4c383f620ada.zip CMake-1f1b62b0e2598554349dce14542a4c383f620ada.tar.gz CMake-1f1b62b0e2598554349dce14542a4c383f620ada.tar.bz2 | |
Merge topic 'cpack-one-component-only'
ed0b0630 CPack: Fix single component packaging
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/CPack/cmCPackGenerator.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/CPack/cmCPackGenerator.cxx b/Source/CPack/cmCPackGenerator.cxx index 995eb0d..4f37041 100644 --- a/Source/CPack/cmCPackGenerator.cxx +++ b/Source/CPack/cmCPackGenerator.cxx @@ -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())); } //---------------------------------------------------------------------- |