diff options
| author | Michael Stürmer <michael.stuermer@schaeffler.com> | 2016-07-20 13:32:38 (GMT) |
|---|---|---|
| committer | Nils Gladitz <nilsgladitz@gmail.com> | 2016-08-08 11:42:23 (GMT) |
| commit | 17bbf6af1ecca15194a693d31fdd8163aacfd994 (patch) | |
| tree | c962a911d846f2cf6bf738315f80a9ba96ee22c5 /Source/CPack/WiX/cmWIXDirectoriesSourceWriter.cxx | |
| parent | 5a62e0c1721281503c8b4cd9d4d3d0de8abebf0f (diff) | |
| download | CMake-17bbf6af1ecca15194a693d31fdd8163aacfd994.zip CMake-17bbf6af1ecca15194a693d31fdd8163aacfd994.tar.gz CMake-17bbf6af1ecca15194a693d31fdd8163aacfd994.tar.bz2 | |
CPackWIX: Implement new CPACK_WIX_SKIP_PROGRAM_FOLDER feature
The new variable allows setting of a custom absolute installation prefix
outside of the ProgramFiles folders.
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) |