diff options
| author | Brad King <brad.king@kitware.com> | 2016-08-01 18:59:53 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2016-08-01 18:59:53 (GMT) |
| commit | 5ec03c93fc92149708b4ec9d19384a015d845f8e (patch) | |
| tree | d856299ffcce91ec04c1188b21eef4a695032a78 | |
| parent | 88e1c54a7cd3213d87143558a8fddf39e7fdccc0 (diff) | |
| parent | ad453f0502fe5d95ca1f050cdf52c2d32a892988 (diff) | |
| download | CMake-5ec03c93fc92149708b4ec9d19384a015d845f8e.zip CMake-5ec03c93fc92149708b4ec9d19384a015d845f8e.tar.gz CMake-5ec03c93fc92149708b4ec9d19384a015d845f8e.tar.bz2 | |
Merge topic 'wix-disabled-components'
ad453f05 CPackWIX: Support CPACK_COMPONENT_<compName>_DISABLED
6f108f84 CPackComponent: Document the *_HIDDEN and *_DISABLED variables
| -rw-r--r-- | Help/release/dev/wix-disabled-components.rst | 6 | ||||
| -rw-r--r-- | Modules/CPackComponent.cmake | 10 | ||||
| -rw-r--r-- | Source/CPack/WiX/cmWIXFeaturesSourceWriter.cxx | 4 |
3 files changed, 19 insertions, 1 deletions
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/Modules/CPackComponent.cmake b/Modules/CPackComponent.cmake index 085992a..6552a2d 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 # 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"); } |