[Cmake-commits] CMake branch, next, updated. v3.2.2-1868-gc64fd6c

[Domen Vrankar]

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  c64fd6c01544f0a1d70b58c4fce675b2eb629996 (commit)
       via  0779b679e59b80ce458c0422a673b36de3a8f4c5 (commit)
      from  0b6e3bc038ade69cb945c663416d4f2acece840a (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=c64fd6c01544f0a1d70b58c4fce675b2eb629996
commit c64fd6c01544f0a1d70b58c4fce675b2eb629996
Merge: 0b6e3bc 0779b67
Author:     Domen Vrankar <domen.vrankar at gmail.com>
AuthorDate: Thu Apr 16 16:17:04 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Apr 16 16:17:04 2015 -0400

    Merge topic 'cpack-one-component-only-fixup' into next
    
    0779b679 fixup! CPack single component packaging


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0779b679e59b80ce458c0422a673b36de3a8f4c5
commit 0779b679e59b80ce458c0422a673b36de3a8f4c5
Author:     Raffi Enficiaud <raffi.enficiaud at mines-paris.org>
AuthorDate: Thu Apr 16 22:14:51 2015 +0200
Commit:     Domen Vrankar <domen.vrankar at gmail.com>
CommitDate: Thu Apr 16 22:14:51 2015 +0200

    fixup! CPack single component packaging
    
    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:
 Source/CPack/cmCPackGenerator.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake