[Cmake-commits] CMake branch, next, updated. v3.6.0-979-g6125cb8

[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  6125cb89387ad20437bdb658bbd1f507a017ab5d (commit)
       via  ad453f0502fe5d95ca1f050cdf52c2d32a892988 (commit)
      from  cb6558209baee2c3c9c41c8b3d71d0cd177983c3 (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=6125cb89387ad20437bdb658bbd1f507a017ab5d
commit 6125cb89387ad20437bdb658bbd1f507a017ab5d
Merge: cb65582 ad453f0
Author:     Nils Gladitz <nilsgladitz at gmail.com>
AuthorDate: Fri Jul 22 02:50:15 2016 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Jul 22 02:50:15 2016 -0400

    Merge topic 'wix-disabled-components' into next
    
    ad453f05 CPackWIX: Support CPACK_COMPONENT_<compName>_DISABLED


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ad453f0502fe5d95ca1f050cdf52c2d32a892988
commit ad453f0502fe5d95ca1f050cdf52c2d32a892988
Author:     Michael Stürmer <michael.stuermer at schaeffler.com>
AuthorDate: Thu Jul 21 16:34:35 2016 +0200
Commit:     Nils Gladitz <nilsgladitz at gmail.com>
CommitDate: Fri Jul 22 08:49:29 2016 +0200

    CPackWIX: Support CPACK_COMPONENT_<compName>_DISABLED
    
    Reviewed-by: Nils Gladitz <nilsgladitz at gmail.com>

diff --git a/Help/release/dev/wix-disabled-components.rst b/Help/release/dev/wix-disabled-components.rst
new file mode 100644
index 0000000..a7e4d5f
--- /dev/null
+++ b/Help/release/dev/wix-disabled-components.rst
@@ -0,0 +1,6 @@
+wix-disabled-components
+-----------------------
+
+* The CPack WIX generator now supports
+  :variable:`CPACK_COMPONENT_<compName>_DISABLED`.
+  This can be used to deselect a component from being installed by default.
diff --git a/Source/CPack/WiX/cmWIXFeaturesSourceWriter.cxx b/Source/CPack/WiX/cmWIXFeaturesSourceWriter.cxx
index 16dd0ab..1747b62 100644
--- a/Source/CPack/WiX/cmWIXFeaturesSourceWriter.cxx
+++ b/Source/CPack/WiX/cmWIXFeaturesSourceWriter.cxx
@@ -86,6 +86,10 @@ void cmWIXFeaturesSourceWriter::EmitFeatureForComponent(
     AddAttribute("Display", "hidden");
   }
 
+  if (component.IsDisabledByDefault) {
+    AddAttribute("Level", "2");
+  }
+
   EndElement("Feature");
 }
 

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

Summary of changes:


hooks/post-receive
-- 
CMake