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

CPackWIX: Fix MSI package layout regression from parent 

The parent commit added a regression where if the install directory had:

  parent
    child A
    child B

the produced MSI would install:

  parent
    child A
       child B
This commit is contained in:
Ian Monroe 2013-04-18 10:19:13 -07:00 committed by Brad King
parent 8c0e32550c
commit 6d77e1ab3f
1 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -377,10 +377,6 @@ bool cmCPackWIXGenerator::CreateWiXSourceFiles()
directoryDefinitions, fileDefinitions, featureDefinitions, directoryDefinitions, fileDefinitions, featureDefinitions,
directoryCounter, fileCounter, cpackPkgExecutables, dirIdExecutables); directoryCounter, fileCounter, cpackPkgExecutables, dirIdExecutables);
for(size_t i = 1; i < install_root.size(); ++i)
{
directoryDefinitions.EndElement();
}
directoryDefinitions.EndElement(); directoryDefinitions.EndElement();
directoryDefinitions.EndElement(); directoryDefinitions.EndElement();
@ -558,7 +554,7 @@ void cmCPackWIXGenerator::AddDirectoryAndFileDefinitons(
fileCounter, fileCounter,
pkgExecutables, pkgExecutables,
dirIdExecutables); dirIdExecutables);
directoryDefinitions.EndElement();
} }
else else
{ {