[Cmake-commits] CMake branch, next, updated. v3.6.0-945-g065fed9

[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  065fed946d82bf349df37ddc069e54f6297cc17e (commit)
       via  4c52c4c24d9cd809546c309f7f41e3b43cf55169 (commit)
       via  811bcf543ceb04f72d0127ac42b7b198be4791dc (commit)
      from  c4b65e3e67d9e3a23060a0b7352a1845846ea1ae (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=065fed946d82bf349df37ddc069e54f6297cc17e
commit 065fed946d82bf349df37ddc069e54f6297cc17e
Merge: c4b65e3 4c52c4c
Author:     Nils Gladitz <nilsgladitz at gmail.com>
AuthorDate: Thu Jul 21 10:40:04 2016 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Jul 21 10:40:04 2016 -0400

    Merge topic 'wix-disabled-components' into next
    
    4c52c4c2 CPackWIX: Support CPACK_COMPONENT_<COMPONENT>_DISABLED
    811bcf54 CMake Nightly Date Stamp


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4c52c4c24d9cd809546c309f7f41e3b43cf55169
commit 4c52c4c24d9cd809546c309f7f41e3b43cf55169
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: Thu Jul 21 16:38:24 2016 +0200

    CPackWIX: Support CPACK_COMPONENT_<COMPONENT>_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..ac37bc7
--- /dev/null
+++ b/Help/release/dev/wix-disabled-components.rst
@@ -0,0 +1,5 @@
+wix-disabled-components
+-----------------------
+
+* The CPack WIX generator now supports CPACK_COMPONENT_<COMPONENT>_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:
 Help/release/dev/wix-disabled-components.rst   |    5 +++++
 Source/CMakeVersion.cmake                      |    2 +-
 Source/CPack/WiX/cmWIXFeaturesSourceWriter.cxx |    4 ++++
 3 files changed, 10 insertions(+), 1 deletion(-)
 create mode 100644 Help/release/dev/wix-disabled-components.rst


hooks/post-receive
-- 
CMake