diff options
author | Nils Gladitz <nilsgladitz@gmail.com> | 2015-02-21 16:30:31 (GMT) |
---|---|---|
committer | Nils Gladitz <nilsgladitz@gmail.com> | 2015-02-21 16:30:31 (GMT) |
commit | 279605f560312aab4dfeef4cce1c8c67d4083b4e (patch) | |
tree | 6f91cd08d36c85c5fafcdef3e70ba2207707c2c3 /Source/CPack/WiX/cmCPackWIXGenerator.cxx | |
parent | 53d7dafface62d40ea795456394f7ab1d5ee6712 (diff) | |
download | CMake-279605f560312aab4dfeef4cce1c8c67d4083b4e.zip CMake-279605f560312aab4dfeef4cce1c8c67d4083b4e.tar.gz CMake-279605f560312aab4dfeef4cce1c8c67d4083b4e.tar.bz2 |
CPackWIX: Add installed file properties for the creation of shortcuts.
Diffstat (limited to 'Source/CPack/WiX/cmCPackWIXGenerator.cxx')
-rw-r--r-- | Source/CPack/WiX/cmCPackWIXGenerator.cxx | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/Source/CPack/WiX/cmCPackWIXGenerator.cxx b/Source/CPack/WiX/cmCPackWIXGenerator.cxx index f18eaeb..c6daeda 100644 --- a/Source/CPack/WiX/cmCPackWIXGenerator.cxx +++ b/Source/CPack/WiX/cmCPackWIXGenerator.cxx @@ -856,8 +856,8 @@ void cmCPackWIXGenerator::AddDirectoryAndFileDefinitons( cmWIXDirectoriesSourceWriter& directoryDefinitions, cmWIXFilesSourceWriter& fileDefinitions, cmWIXFeaturesSourceWriter& featureDefinitions, - const std::vector<std::string>& packageExecutables, - const std::vector<std::string>& desktopExecutables, + std::vector<std::string> const& packageExecutables, + std::vector<std::string> const& desktopExecutables, cmWIXShortcuts& shortcuts) { cmsys::Directory dir; @@ -943,6 +943,11 @@ void cmCPackWIXGenerator::AddDirectoryAndFileDefinitons( cmInstalledFile const* installedFile = this->GetInstalledFile(relativePath); + if(installedFile) + { + shortcuts.CreateFromProperties(id, directoryId, *installedFile); + } + std::string componentId = fileDefinitions.EmitComponentFile( directoryId, id, fullPath, *(this->Patch), installedFile); |