kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge topic 'wix-root-description' 

e29bfbf2 CPackWIX: Support custom title and description for the root feature
This commit is contained in:
Brad King 2016-08-03 09:20:38 -04:00 committed by CMake Topic Stage
parent 8ba870bad6 e29bfbf272
commit 7b65e49529
3 changed files with 26 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Help/release/dev/wix-root-description.rst Normal file
View File

@ -0,0 +1,7 @@
wix-root-description
--------------------
* The CPack WIX generator now supports
:variable:`CPACK_WIX_ROOT_FEATURE_TITLE` and
:variable:`CPACK_WIX_ROOT_FEATURE_DESCRIPTION` to allow the specification
of a custom title and description for the root feature element.

11
Modules/CPackWIX.cmake
View File

@ -237,6 +237,17 @@
# * ARPURLUPDATEINFO - Update information URL # * ARPURLUPDATEINFO - Update information URL
# * ARPHELPTELEPHONE - Help and support telephone number # * ARPHELPTELEPHONE - Help and support telephone number
# * ARPSIZE - Size (in kilobytes) of the application # * ARPSIZE - Size (in kilobytes) of the application
#
# .. variable:: CPACK_WIX_ROOT_FEATURE_TITLE
#
# Sets the name of the root install feature in the WIX installer. Same as
# CPACK_COMPONENT_<compName>_DISPLAY_NAME for components.
#
# .. variable:: CPACK_WIX_ROOT_FEATURE_DESCRIPTION
#
# Sets the description of the root install feature in the WIX installer. Same as
# CPACK_COMPONENT_<compName>_DESCRIPTION for components.
#
#============================================================================= #=============================================================================
# Copyright 2014-2015 Kitware, Inc. # Copyright 2014-2015 Kitware, Inc.

9
Source/CPack/WiX/cmCPackWIXGenerator.cxx
View File

@ -464,7 +464,14 @@ bool cmCPackWIXGenerator::CreateWiXSourceFiles()
return false; 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"); featureDefinitions.AddAttribute("Level", "1");
this->Patch->ApplyFragment("#PRODUCTFEATURE", featureDefinitions); this->Patch->ApplyFragment("#PRODUCTFEATURE", featureDefinitions);