diff options
| author | Ian Monroe <imonroe@kde.org> | 2013-04-18 17:19:13 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2013-07-19 14:49:20 (GMT) |
| commit | 6d77e1ab3f6cfe5e2019a418da7c18cc3515ab54 (patch) | |
| tree | 419d85bec6da7c7c83d30c6dc5224f29c17080a5 | |
| parent | 8c0e32550cf8afbb8419dff3698915b550e9c86d (diff) | |
| download | CMake-6d77e1ab3f6cfe5e2019a418da7c18cc3515ab54.zip CMake-6d77e1ab3f6cfe5e2019a418da7c18cc3515ab54.tar.gz CMake-6d77e1ab3f6cfe5e2019a418da7c18cc3515ab54.tar.bz2 | |
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
| -rw-r--r-- | Source/CPack/WiX/cmCPackWIXGenerator.cxx | 6 |
1 files changed, 1 insertions, 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 { |