summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Stürmer <michael.stuermer@schaeffler.com>2016-07-21 14:34:35 (GMT)
committerNils Gladitz <nilsgladitz@gmail.com>2016-07-22 06:49:29 (GMT)
commitad453f0502fe5d95ca1f050cdf52c2d32a892988 (patch)
tree6029b03b30df326546c3259fda7f7946e4f875fc
parent6f108f84d08a4cc12ef5bafc93d5aad903ba687a (diff)
downloadCMake-ad453f0502fe5d95ca1f050cdf52c2d32a892988.zip
CMake-ad453f0502fe5d95ca1f050cdf52c2d32a892988.tar.gz
CMake-ad453f0502fe5d95ca1f050cdf52c2d32a892988.tar.bz2
CPackWIX: Support CPACK_COMPONENT_<compName>_DISABLED
Reviewed-by: Nils Gladitz <nilsgladitz@gmail.com>
-rw-r--r--Help/release/dev/wix-disabled-components.rst6
-rw-r--r--Source/CPack/WiX/cmWIXFeaturesSourceWriter.cxx4
2 files changed, 10 insertions, 0 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/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");
}