diff options
author | Brad King <brad.king@kitware.com> | 2015-02-23 16:06:07 (GMT) |
---|---|---|
committer | CMake Topic Stage <kwrobot@kitware.com> | 2015-02-23 16:06:07 (GMT) |
commit | cb16c7844dce627ab40f404c6ac49db3cde7b0c0 (patch) | |
tree | 7c7d02394c21403d1ef2cf41a34551ed2da0d30c /Source/CPack/WiX/cmWIXFilesSourceWriter.h | |
parent | 7cebc5acacc14e0d4c9416735c86c5870671f173 (diff) | |
parent | 6cc01c140245749bb6a6d5096b4a38f3f16fb776 (diff) | |
download | CMake-cb16c7844dce627ab40f404c6ac49db3cde7b0c0.zip CMake-cb16c7844dce627ab40f404c6ac49db3cde7b0c0.tar.gz CMake-cb16c7844dce627ab40f404c6ac49db3cde7b0c0.tar.bz2 |
Merge topic 'wix-shortcut-properties'
6cc01c14 CPackWIX: Add release notes for the wix-shortcut-properties topic.
135febf0 CPackWIX: Enhance CMake CPack WIX generated installer.
e6731f48 CPackWIX: Add new CPACK_STARTUP_SHORTCUTS property.
279605f5 CPackWIX: Add installed file properties for the creation of shortcuts.
53d7daff CPackWIX: Refactor start menu and desktop shortcut creation.
dc0f3fb4 CPackWIX: Explicitly list CPack WIX headers for IDE convenience.
Diffstat (limited to 'Source/CPack/WiX/cmWIXFilesSourceWriter.h')
-rw-r--r-- | Source/CPack/WiX/cmWIXFilesSourceWriter.h | 20 |
1 files changed, 6 insertions, 14 deletions
diff --git a/Source/CPack/WiX/cmWIXFilesSourceWriter.h b/Source/CPack/WiX/cmWIXFilesSourceWriter.h index b0a4af8..c48bc15 100644 --- a/Source/CPack/WiX/cmWIXFilesSourceWriter.h +++ b/Source/CPack/WiX/cmWIXFilesSourceWriter.h @@ -1,6 +1,6 @@ /*============================================================================ CMake - Cross Platform Makefile Generator - Copyright 2014 Kitware, Inc. + Copyright 2014-2015 Kitware, Inc. Distributed under the OSI-approved BSD License (the "License"); see accompanying file Copyright.txt for details. @@ -31,17 +31,15 @@ public: void EmitShortcut( std::string const& id, cmWIXShortcut const& shortcut, - bool desktop); + std::string const& shortcutPrefix, + size_t shortcutIndex); void EmitRemoveFolder(std::string const& id); - void EmitStartMenuShortcutRegistryValue( - std::string const& registryKey, - std::string const& cpackComponentName); - - void EmitDesktopShortcutRegistryValue( + void EmitInstallRegistryValue( std::string const& registryKey, - std::string const& cpackComponentName); + std::string const& cpackComponentName, + std::string const& suffix); void EmitUninstallShortcut(std::string const& packageName); @@ -56,12 +54,6 @@ public: std::string const& filePath, cmWIXPatch &patch, cmInstalledFile const* installedFile); - -private: - void EmitInstallRegistryValue( - std::string const& registryKey, - std::string const& cpackComponentName, - std::string const& suffix); }; |