From 6d77e1ab3f6cfe5e2019a418da7c18cc3515ab54 Mon Sep 17 00:00:00 2001 From: Ian Monroe Date: Thu, 18 Apr 2013 10:19:13 -0700 Subject: 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 --- Source/CPack/WiX/cmCPackWIXGenerator.cxx | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/Source/CPack/WiX/cmCPackWIXGenerator.cxx b/Source/CPack/WiX/cmCPackWIXGenerator.cxx index fc51b77..f443905 100644 --- a/Source/CPack/WiX/cmCPackWIXGenerator.cxx +++ b/Source/CPack/WiX/cmCPackWIXGenerator.cxx @@ -377,10 +377,6 @@ bool cmCPackWIXGenerator::CreateWiXSourceFiles() directoryDefinitions, fileDefinitions, featureDefinitions, directoryCounter, fileCounter, cpackPkgExecutables, dirIdExecutables); - for(size_t i = 1; i < install_root.size(); ++i) - { - directoryDefinitions.EndElement(); - } directoryDefinitions.EndElement(); directoryDefinitions.EndElement(); @@ -558,7 +554,7 @@ void cmCPackWIXGenerator::AddDirectoryAndFileDefinitons( fileCounter, pkgExecutables, dirIdExecutables); - + directoryDefinitions.EndElement(); } else { -- cgit v0.12