diff options
| author | Michael Stürmer <michael.stuermer@schaeffler.com> | 2016-09-06 10:11:00 (GMT) |
|---|---|---|
| committer | Nils Gladitz <nilsgladitz@gmail.com> | 2016-09-06 15:44:48 (GMT) |
| commit | 1bc33257d48bb4b54333b755951967c6c3fa1df6 (patch) | |
| tree | 9279d779c344357821f3a5e199e8ca0410cec39d /Source/CPack/WiX/cmWIXFilesSourceWriter.h | |
| parent | 8317ea01aa3cf9319ef907e127fa6dbf9666cc53 (diff) | |
| download | CMake-1bc33257d48bb4b54333b755951967c6c3fa1df6.zip CMake-1bc33257d48bb4b54333b755951967c6c3fa1df6.tar.gz CMake-1bc33257d48bb4b54333b755951967c6c3fa1df6.tar.bz2 | |
CPackWIX: Fix incomplete CPACK_WIX_SKIP_PROGRAM_FOLDER implementation
Commit 17bbf6af (CPackWIX: Implement new CPACK_WIX_SKIP_PROGRAM_FOLDER
feature) generates GUIDs for most but not all components
when the feature is active.
Generate the remaining GUIDs as well.
Co-Author: Nils Gladitz <nilsgladitz@gmail.com>
Diffstat (limited to 'Source/CPack/WiX/cmWIXFilesSourceWriter.h')
| -rw-r--r-- | Source/CPack/WiX/cmWIXFilesSourceWriter.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/Source/CPack/WiX/cmWIXFilesSourceWriter.h b/Source/CPack/WiX/cmWIXFilesSourceWriter.h index eeb84cb..c1952af 100644 --- a/Source/CPack/WiX/cmWIXFilesSourceWriter.h +++ b/Source/CPack/WiX/cmWIXFilesSourceWriter.h @@ -26,7 +26,8 @@ class cmWIXFilesSourceWriter : public cmWIXSourceWriter { public: - cmWIXFilesSourceWriter(cmCPackLog* logger, std::string const& filename); + cmWIXFilesSourceWriter(cmCPackLog* logger, std::string const& filename, + GuidType componentGuidType); void EmitShortcut(std::string const& id, cmWIXShortcut const& shortcut, std::string const& shortcutPrefix, size_t shortcutIndex); @@ -47,8 +48,6 @@ public: std::string const& id, std::string const& filePath, cmWIXPatch& patch, cmInstalledFile const* installedFile); - - bool GenerateComponentGuids; }; #endif |