From ed0b06308523e56f6df5de9abdb5211e908ce772 Mon Sep 17 00:00:00 2001 From: Raffi Enficiaud Date: Thu, 16 Apr 2015 22:14:51 +0200 Subject: [PATCH] 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. --- Source/CPack/cmCPackGenerator.cxx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Source/CPack/cmCPackGenerator.cxx b/Source/CPack/cmCPackGenerator.cxx index 995eb0d97..4f370419c 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())); } //----------------------------------------------------------------------