diff options
| author | Brad King <brad.king@kitware.com> | 2019-09-13 13:53:16 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2019-09-13 13:53:41 (GMT) |
| commit | 0b8c0b26ce076952bfdc0392d2c93c3597974c9f (patch) | |
| tree | d42a7e06a3b25e9a4983ee402aa582cd9110ec81 /Source/CPack/WiX/cmWIXDirectoriesSourceWriter.cxx | |
| parent | bacb50afa9ed7806a8900ab7524f2f4a4cd7d669 (diff) | |
| parent | d69457077d021b7d4ea10bf2201da61222966c92 (diff) | |
| download | CMake-0b8c0b26ce076952bfdc0392d2c93c3597974c9f.zip CMake-0b8c0b26ce076952bfdc0392d2c93c3597974c9f.tar.gz CMake-0b8c0b26ce076952bfdc0392d2c93c3597974c9f.tar.bz2 | |
Merge topic 'cpack-wix-start-menu'
d69457077d CPackWIX: Allow omitting program menu folder and uninstall shortcut
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3802
Diffstat (limited to 'Source/CPack/WiX/cmWIXDirectoriesSourceWriter.cxx')
| -rw-r--r-- | Source/CPack/WiX/cmWIXDirectoriesSourceWriter.cxx | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/Source/CPack/WiX/cmWIXDirectoriesSourceWriter.cxx b/Source/CPack/WiX/cmWIXDirectoriesSourceWriter.cxx index 975dffb..0a83ca2 100644 --- a/Source/CPack/WiX/cmWIXDirectoriesSourceWriter.cxx +++ b/Source/CPack/WiX/cmWIXDirectoriesSourceWriter.cxx @@ -14,10 +14,12 @@ void cmWIXDirectoriesSourceWriter::EmitStartMenuFolder( BeginElement("Directory"); AddAttribute("Id", "ProgramMenuFolder"); - BeginElement("Directory"); - AddAttribute("Id", "PROGRAM_MENU_FOLDER"); - AddAttribute("Name", startMenuFolder); - EndElement("Directory"); + if (startMenuFolder != ".") { + BeginElement("Directory"); + AddAttribute("Id", "PROGRAM_MENU_FOLDER"); + AddAttribute("Name", startMenuFolder); + EndElement("Directory"); + } EndElement("Directory"); } |