[Cmake-commits] CMake branch, next, updated. v3.2.2-1870-g9d4cc1d

[Brad King]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  9d4cc1d7b186eb2665e2db3223a6d28874ca4076 (commit)
       via  ed0b06308523e56f6df5de9abdb5211e908ce772 (commit)
      from  c64fd6c01544f0a1d70b58c4fce675b2eb629996 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9d4cc1d7b186eb2665e2db3223a6d28874ca4076
commit 9d4cc1d7b186eb2665e2db3223a6d28874ca4076
Merge: c64fd6c ed0b063
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Apr 16 16:30:09 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Apr 16 16:30:09 2015 -0400

    Merge topic 'cpack-one-component-only' into next
    
    ed0b0630 CPack: Fix single component packaging


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ed0b06308523e56f6df5de9abdb5211e908ce772
commit ed0b06308523e56f6df5de9abdb5211e908ce772
Author:     Raffi Enficiaud <raffi.enficiaud at mines-paris.org>
AuthorDate: Thu Apr 16 22:14:51 2015 +0200
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Apr 16 16:29:33 2015 -0400

    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.

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()));
 }
 
 //----------------------------------------------------------------------

-----------------------------------------------------------------------

Summary of changes:


hooks/post-receive
-- 
CMake