summaryrefslogtreecommitdiffstats
path: root/Source
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2016-08-03 13:20:38 (GMT)
committerCMake Topic Stage <kwrobot@kitware.com>2016-08-03 13:20:38 (GMT)
commit7b65e49529bbc384b2f241685d647f26ac041d5b (patch)
tree040fe686ff00ffc84e2fc86259358aef3be08c2c /Source
parent8ba870bad6210ae2c053ae4f7c19bcb9d8312eab (diff)
parente29bfbf272dbf4ea5f6a89084ec1f503fcf0e4f7 (diff)
downloadCMake-7b65e49529bbc384b2f241685d647f26ac041d5b.zip
CMake-7b65e49529bbc384b2f241685d647f26ac041d5b.tar.gz
CMake-7b65e49529bbc384b2f241685d647f26ac041d5b.tar.bz2
Merge topic 'wix-root-description'
e29bfbf2 CPackWIX: Support custom title and description for the root feature
Diffstat (limited to 'Source')
-rw-r--r--Source/CPack/WiX/cmCPackWIXGenerator.cxx9
1 files changed, 8 insertions, 1 deletions
diff --git a/Source/CPack/WiX/cmCPackWIXGenerator.cxx b/Source/CPack/WiX/cmCPackWIXGenerator.cxx
index 97216c3..3ecc14d 100644
--- a/Source/CPack/WiX/cmCPackWIXGenerator.cxx
+++ b/Source/CPack/WiX/cmCPackWIXGenerator.cxx
@@ -464,7 +464,14 @@ bool cmCPackWIXGenerator::CreateWiXSourceFiles()
return false;
}
- featureDefinitions.AddAttribute("Title", cpackPackageName);
+ std::string featureTitle = cpackPackageName;
+ if (const char* title = GetOption("CPACK_WIX_ROOT_FEATURE_TITLE")) {
+ featureTitle = title;
+ }
+ featureDefinitions.AddAttribute("Title", featureTitle);
+ if (const char* desc = GetOption("CPACK_WIX_ROOT_FEATURE_DESCRIPTION")) {
+ featureDefinitions.AddAttribute("Description", desc);
+ }
featureDefinitions.AddAttribute("Level", "1");
this->Patch->ApplyFragment("#PRODUCTFEATURE", featureDefinitions);