diff options
| author | Brad King <brad.king@kitware.com> | 2016-08-09 13:20:13 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2016-08-09 13:20:13 (GMT) |
| commit | 892ffe4ebd5ca0fd36255671efe37edc9448b470 (patch) | |
| tree | bbdf63af13c49f03f675acdc8754a166387a9137 /Source/CPack/WiX/cmWIXDirectoriesSourceWriter.cxx | |
| parent | 982b4cd602fc125c9d2165145100d5e574644bf9 (diff) | |
| parent | 17bbf6af1ecca15194a693d31fdd8163aacfd994 (diff) | |
| download | CMake-892ffe4ebd5ca0fd36255671efe37edc9448b470.zip CMake-892ffe4ebd5ca0fd36255671efe37edc9448b470.tar.gz CMake-892ffe4ebd5ca0fd36255671efe37edc9448b470.tar.bz2 | |
Merge topic 'wix-custom-install-dir'
17bbf6af CPackWIX: Implement new CPACK_WIX_SKIP_PROGRAM_FOLDER feature
Diffstat (limited to 'Source/CPack/WiX/cmWIXDirectoriesSourceWriter.cxx')
| -rw-r--r-- | Source/CPack/WiX/cmWIXDirectoriesSourceWriter.cxx | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/Source/CPack/WiX/cmWIXDirectoriesSourceWriter.cxx b/Source/CPack/WiX/cmWIXDirectoriesSourceWriter.cxx index de64059..97e3a51 100644 --- a/Source/CPack/WiX/cmWIXDirectoriesSourceWriter.cxx +++ b/Source/CPack/WiX/cmWIXDirectoriesSourceWriter.cxx @@ -52,8 +52,12 @@ size_t cmWIXDirectoriesSourceWriter::BeginInstallationPrefixDirectory( std::string const& programFilesFolderId, std::string const& installRootString) { - BeginElement("Directory"); - AddAttribute("Id", programFilesFolderId); + size_t offset = 1; + if (!programFilesFolderId.empty()) { + BeginElement("Directory"); + AddAttribute("Id", programFilesFolderId); + offset = 0; + } std::vector<std::string> installRoot; @@ -77,7 +81,7 @@ size_t cmWIXDirectoriesSourceWriter::BeginInstallationPrefixDirectory( AddAttribute("Name", installRoot[i]); } - return installRoot.size(); + return installRoot.size() - offset; } void cmWIXDirectoriesSourceWriter::EndInstallationPrefixDirectory(size_t size) |