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 54f9c388896fb8b9d5054801ac1327de43fe245a (commit) via 93f61c33346611db0f83529a8901bea84195f277 (commit) via 6f108f84d08a4cc12ef5bafc93d5aad903ba687a (commit) from 48ce4c6d0c7b1b5bab33a4722a63d1116a22f84d (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=54f9c388896fb8b9d5054801ac1327de43fe245a commit 54f9c388896fb8b9d5054801ac1327de43fe245a Merge: 48ce4c6 93f61c3 Author: Nils Gladitz <nilsglad...@gmail.com> AuthorDate: Fri Jul 22 02:41:38 2016 -0400 Commit: CMake Topic Stage <kwro...@kitware.com> CommitDate: Fri Jul 22 02:41:38 2016 -0400 Merge topic 'wix-disabled-components' into next 93f61c33 CPackWIX: Support CPACK_COMPONENT_<COMPONENT>_DISABLED 6f108f84 CPackComponent: Document the *_HIDDEN and *_DISABLED variables https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=93f61c33346611db0f83529a8901bea84195f277 commit 93f61c33346611db0f83529a8901bea84195f277 Author: Michael Stürmer <michael.stuer...@schaeffler.com> AuthorDate: Thu Jul 21 16:34:35 2016 +0200 Commit: Nils Gladitz <nilsglad...@gmail.com> CommitDate: Fri Jul 22 08:41:22 2016 +0200 CPackWIX: Support CPACK_COMPONENT_<COMPONENT>_DISABLED Reviewed-by: Nils Gladitz <nilsglad...@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"); } https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6f108f84d08a4cc12ef5bafc93d5aad903ba687a commit 6f108f84d08a4cc12ef5bafc93d5aad903ba687a Author: Nils Gladitz <nilsglad...@gmail.com> AuthorDate: Fri Jul 22 08:37:29 2016 +0200 Commit: Nils Gladitz <nilsglad...@gmail.com> CommitDate: Fri Jul 22 08:41:22 2016 +0200 CPackComponent: Document the *_HIDDEN and *_DISABLED variables diff --git a/Modules/CPackComponent.cmake b/Modules/CPackComponent.cmake index 6a33086..25d7d61 100644 --- a/Modules/CPackComponent.cmake +++ b/Modules/CPackComponent.cmake @@ -75,9 +75,17 @@ # # The dependencies (list of components) on which this component depends. # +# .. variable:: CPACK_COMPONENT_<compName>_HIDDEN +# +# True if this component is hidden from the user. +# # .. variable:: CPACK_COMPONENT_<compName>_REQUIRED # -# True is this component is required. +# True if this component is required. +# +# .. variable:: CPACK_COMPONENT_<compName>_DISABLED +# +# True if this component is not selected to be installed by default. # # .. command:: cpack_add_component # ----------------------------------------------------------------------- Summary of changes: hooks/post-receive -- CMake _______________________________________________ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits