diff options
| author | Brad King <brad.king@kitware.com> | 2017-04-25 13:05:33 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2017-04-25 13:05:37 (GMT) |
| commit | 75d91e9c85a26796a291a8fb4ba289802313f917 (patch) | |
| tree | eb3f9b8fde429276ec753ccf4754ae2a871158b9 /Source/CPack/WiX/cmWIXFilesSourceWriter.cxx | |
| parent | 60e48295ae95535af7e245f308cf204a3ca9680d (diff) | |
| parent | 58cf9d417e8b3d4d76597b9950a5af4860d3512c (diff) | |
| download | CMake-75d91e9c85a26796a291a8fb4ba289802313f917.zip CMake-75d91e9c85a26796a291a8fb4ba289802313f917.tar.gz CMake-75d91e9c85a26796a291a8fb4ba289802313f917.tar.bz2 | |
Merge topic 'wix-attributes-patch'
58cf9d41 wix: adds ability to modify attributes with patch
03628bb6 wix: fix spelling error in function name
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !742
Diffstat (limited to 'Source/CPack/WiX/cmWIXFilesSourceWriter.cxx')
| -rw-r--r-- | Source/CPack/WiX/cmWIXFilesSourceWriter.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/CPack/WiX/cmWIXFilesSourceWriter.cxx b/Source/CPack/WiX/cmWIXFilesSourceWriter.cxx index 7aa1212..b4cd1a3 100644 --- a/Source/CPack/WiX/cmWIXFilesSourceWriter.cxx +++ b/Source/CPack/WiX/cmWIXFilesSourceWriter.cxx @@ -136,6 +136,7 @@ std::string cmWIXFilesSourceWriter::EmitComponentFile( } } + patch.ApplyFragment(componentId, *this); BeginElement("File"); AddAttribute("Id", fileId); AddAttribute("Source", filePath); @@ -147,16 +148,15 @@ std::string cmWIXFilesSourceWriter::EmitComponentFile( if (!(fileMode & S_IWRITE)) { AddAttribute("ReadOnly", "yes"); } + patch.ApplyFragment(fileId, *this); if (installedFile) { cmWIXAccessControlList acl(Logger, *installedFile, *this); acl.Apply(); } - patch.ApplyFragment(fileId, *this); EndElement("File"); - patch.ApplyFragment(componentId, *this); EndElement("Component"); EndElement("DirectoryRef"); |