From 34644d8f9f5e36dc204988fb1dbd81069b0db83a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20St=C3=BCrmer?= Date: Wed, 20 Jul 2016 15:27:01 +0200 Subject: [PATCH 3/5] added support for CPACK_WIX_ROOT_COMPONENT_DISPLAY_NAME CPACK_WIX_ROOT_COMPONENT_DESCRIPTION in WIX generator --- Modules/CPackWIX.cmake | 11 +++++++++++ Source/CPack/WiX/cmCPackWIXGenerator.cxx | 9 ++++++++- 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/Modules/CPackWIX.cmake b/Modules/CPackWIX.cmake index 3c90561..522ec25 100644 --- a/Modules/CPackWIX.cmake +++ b/Modules/CPackWIX.cmake @@ -237,6 +237,17 @@ # * ARPURLUPDATEINFO - Update information URL # * ARPHELPTELEPHONE - Help and support telephone number # * ARPSIZE - Size (in kilobytes) of the application +# +# .. variable:: CPACK_WIX_ROOT_COMPONENT_DISPLAY_NAME +# +# Sets the name of the root install feature in the WIX installer. Same as +# CPACK_COMPONENT__DISPLAY_NAME for components. +# +# .. variable:: CPACK_WIX_ROOT_COMPONENT_DESCRIPTION +# +# Sets the description of the root install feature in the WIX installer. Same as +# CPACK_COMPONENT__DESCRIPTION for components. +# #============================================================================= # Copyright 2014-2015 Kitware, Inc. diff --git a/Source/CPack/WiX/cmCPackWIXGenerator.cxx b/Source/CPack/WiX/cmCPackWIXGenerator.cxx index 97216c3..fa6fc73 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_COMPONENT_DISPLAY_NAME")) { + featureTitle = title; + } + featureDefinitions.AddAttribute("Title", featureTitle); + if (const char* desc = GetOption("CPACK_WIX_ROOT_COMPONENT_DESCRIPTION")) { + featureDefinitions.AddAttribute("Description", desc); + } featureDefinitions.AddAttribute("Level", "1"); this->Patch->ApplyFragment("#PRODUCTFEATURE", featureDefinitions); -- 2.8.0.windows.1