diff options
| author | Raffi Enficiaud <raffi.enficiaud@mines-paris.org> | 2015-04-16 20:14:51 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2015-04-16 20:29:33 (GMT) |
| commit | ed0b06308523e56f6df5de9abdb5211e908ce772 (patch) | |
| tree | 013015b29170936555296c1c9c78f306ce561b35 /Source/CPack/cmCPackGenerator.cxx | |
| parent | 0ffd35340e5458882b4b9596a84dd7cdfeaecfbd (diff) | |
| download | CMake-ed0b06308523e56f6df5de9abdb5211e908ce772.zip CMake-ed0b06308523e56f6df5de9abdb5211e908ce772.tar.gz CMake-ed0b06308523e56f6df5de9abdb5211e908ce772.tar.bz2 | |
CPack: Fix single component packaging
Refine logic added in commit 0ffd3534 (CPack single component packaging,
2015-04-02). Component packaging should be enabled if either at least
one component or one group is set and should not require both.
Diffstat (limited to 'Source/CPack/cmCPackGenerator.cxx')
| -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())); } //---------------------------------------------------------------------- |