diff options
| author | Brad King <brad.king@kitware.com> | 2015-11-10 14:26:13 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2015-11-10 14:26:13 (GMT) |
| commit | 3cb726371f27948149f668d43aa58cd2a5e9be4c (patch) | |
| tree | 1772c3689a8f9ab4131726c6b700149d36356af7 | |
| parent | 556fe92b765ea6d200b76c4e6d35a2147952d9a3 (diff) | |
| parent | d3625b72834ab63a2c946c75f7949aaffaf9427c (diff) | |
| download | CMake-3cb726371f27948149f668d43aa58cd2a5e9be4c.zip CMake-3cb726371f27948149f668d43aa58cd2a5e9be4c.tar.gz CMake-3cb726371f27948149f668d43aa58cd2a5e9be4c.tar.bz2 | |
Merge topic 'wix-toplevel-feature-required'
d3625b72 CPackWIX: Don't allow users to deselect the top-level feature (#15838)
| -rw-r--r-- | Source/CPack/WiX/cmCPackWIXGenerator.cxx | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/Source/CPack/WiX/cmCPackWIXGenerator.cxx b/Source/CPack/WiX/cmCPackWIXGenerator.cxx index 6f25e50..d5246db 100644 --- a/Source/CPack/WiX/cmCPackWIXGenerator.cxx +++ b/Source/CPack/WiX/cmCPackWIXGenerator.cxx @@ -482,6 +482,7 @@ bool cmCPackWIXGenerator::CreateWiXSourceFiles() featureDefinitions.BeginElement("Feature"); featureDefinitions.AddAttribute("Id", "ProductFeature"); featureDefinitions.AddAttribute("Display", "expand"); + featureDefinitions.AddAttribute("Absent", "disallow"); featureDefinitions.AddAttribute("ConfigurableDirectory", "INSTALL_ROOT"); std::string cpackPackageName; |