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

CPackWIX: Handle multiple shortcuts in the start menu

This commit is contained in:
Richard Ulrich 2013-05-08 16:39:32 +02:00 committed by Brad King
parent 6d77e1ab3f
commit 6e51ea9870
1 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -380,7 +380,14 @@ bool cmCPackWIXGenerator::CreateWiXSourceFiles()
directoryDefinitions.EndElement(); directoryDefinitions.EndElement();
directoryDefinitions.EndElement(); directoryDefinitions.EndElement();
if (dirIdExecutables.size() > 0 && dirIdExecutables.size() % 3 == 0) { if (dirIdExecutables.size() > 0 && dirIdExecutables.size() % 3 == 0)
{
fileDefinitions.BeginElement("DirectoryRef");
fileDefinitions.AddAttribute("Id", "PROGRAM_MENU_FOLDER");
fileDefinitions.BeginElement("Component");
fileDefinitions.AddAttribute("Id", "SHORTCUT");
fileDefinitions.AddAttribute("Guid", "*");
std::vector<std::string>::iterator it; std::vector<std::string>::iterator it;
for ( it = dirIdExecutables.begin() ; for ( it = dirIdExecutables.begin() ;
it != dirIdExecutables.end(); it != dirIdExecutables.end();
@ -390,13 +397,12 @@ bool cmCPackWIXGenerator::CreateWiXSourceFiles()
std::string iconName = *it++; std::string iconName = *it++;
std::string directoryId = *it; std::string directoryId = *it;
fileDefinitions.BeginElement("DirectoryRef");
fileDefinitions.AddAttribute("Id", "PROGRAM_MENU_FOLDER");
fileDefinitions.BeginElement("Component");
fileDefinitions.AddAttribute("Id", "SHORTCUT");
fileDefinitions.AddAttribute("Guid", "*");
fileDefinitions.BeginElement("Shortcut"); fileDefinitions.BeginElement("Shortcut");
fileDefinitions.AddAttribute("Id", "SHORTCUT_"); std::string shortcutName = fileName; // the iconName is mor likely to contain blanks early on
std::string::size_type const dotPos = shortcutName.find('.');
if(std::string::npos == dotPos)
{ shortcutName = shortcutName.substr(0, dotPos); }
fileDefinitions.AddAttribute("Id", "SHORTCUT_" + shortcutName);
fileDefinitions.AddAttribute("Name", iconName); fileDefinitions.AddAttribute("Name", iconName);
std::string target = "[" + directoryId + "]" + fileName; std::string target = "[" + directoryId + "]" + fileName;
fileDefinitions.AddAttribute("Target", target); fileDefinitions.AddAttribute("Target", target);