[Cmake-commits] CMake branch, next, updated. v3.4.0-rc3-1291-g377027b

[Nils Gladitz]

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  377027bdfcdef823f282c7d107984f2ac41310e3 (commit)
       via  d3625b72834ab63a2c946c75f7949aaffaf9427c (commit)
      from  b5ff9b5676858ec63e0bbb84686ca7c5f495c47a (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 -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=377027bdfcdef823f282c7d107984f2ac41310e3
commit 377027bdfcdef823f282c7d107984f2ac41310e3
Merge: b5ff9b5 d3625b7
Author:     Nils Gladitz <nilsgladitz at gmail.com>
AuthorDate: Mon Nov 9 11:52:05 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Nov 9 11:52:05 2015 -0500

    Merge topic 'wix-toplevel-feature-required' into next
    
    d3625b72 CPackWIX: Don't allow users to deselect the top-level feature (#15838)


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d3625b72834ab63a2c946c75f7949aaffaf9427c
commit d3625b72834ab63a2c946c75f7949aaffaf9427c
Author:     Nils Gladitz <nilsgladitz at gmail.com>
AuthorDate: Mon Nov 9 17:50:21 2015 +0100
Commit:     Nils Gladitz <nilsgladitz at gmail.com>
CommitDate: Mon Nov 9 17:50:21 2015 +0100

    CPackWIX: Don't allow users to deselect the top-level feature (#15838)
    
    The top-level WiX feature implicitly created by the WIX generator
    represents the package as a whole.
    
    As such it does not make sense to allow installer users to deselect
    it from the installation.
    
    Suggested-by: Mark Stijnman

diff --git a/Source/CPack/WiX/cmCPackWIXGenerator.cxx b/Source/CPack/WiX/cmCPackWIXGenerator.cxx
index 6f25e50..d5246db 100644
--- a/Source/CPack/WiX/cmCPackWIXGenerator.cxx
+++ b/Source/CPack/WiX/cmCPackWIXGenerator.cxx
@@ -482,6 +482,7 @@ bool cmCPackWIXGenerator::CreateWiXSourceFiles()
   featureDefinitions.BeginElement("Feature");
   featureDefinitions.AddAttribute("Id", "ProductFeature");
   featureDefinitions.AddAttribute("Display", "expand");
+  featureDefinitions.AddAttribute("Absent", "disallow");
   featureDefinitions.AddAttribute("ConfigurableDirectory", "INSTALL_ROOT");
 
   std::string cpackPackageName;

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

Summary of changes:
 Source/CPack/WiX/cmCPackWIXGenerator.cxx |    1 +
 1 file changed, 1 insertion(+)


hooks/post-receive
-- 
CMake