diff options
| author | Brad King <brad.king@kitware.com> | 2015-12-18 15:55:35 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2015-12-18 15:55:35 (GMT) |
| commit | f9e3ca46cbeae4fb885398e8f7b90c784078b1d3 (patch) | |
| tree | bd0c8b159a29f3d88be6bd20eb10bbb58df9da39 /CMakeCPackOptions.cmake.in | |
| parent | 5ffdd37b7ff8279ffffbf8cc5a007a541be0d7ff (diff) | |
| parent | 24cdb9df598a1c10fffc718255527729595442a1 (diff) | |
| download | CMake-f9e3ca46cbeae4fb885398e8f7b90c784078b1d3.zip CMake-f9e3ca46cbeae4fb885398e8f7b90c784078b1d3.tar.gz CMake-f9e3ca46cbeae4fb885398e8f7b90c784078b1d3.tar.bz2 | |
Merge topic 'release-wix-config-ng'
24cdb9df CMake: Mimic NSIS options dialog in WiX installer
de77d4a7 CPackWIX: Allow multiple patch files and diagnose if any are missing
38d723b3 CPackWIX: Allow patching of shortcut components
Diffstat (limited to 'CMakeCPackOptions.cmake.in')
| -rw-r--r-- | CMakeCPackOptions.cmake.in | 29 |
1 files changed, 27 insertions, 2 deletions
diff --git a/CMakeCPackOptions.cmake.in b/CMakeCPackOptions.cmake.in index 4ebf306..25af0c9 100644 --- a/CMakeCPackOptions.cmake.in +++ b/CMakeCPackOptions.cmake.in @@ -234,10 +234,35 @@ if("${CPACK_GENERATOR}" STREQUAL "WIX") set(CPACK_WIX_LIGHT_EXTRA_FLAGS "-dcl:high") set(CPACK_WIX_UI_BANNER - "@CMake_SOURCE_DIR@/Utilities/Release/cpack_wix_ui_banner.jpg" + "@CMake_SOURCE_DIR@/Utilities/Release/WiX/ui_banner.jpg" ) set(CPACK_WIX_UI_DIALOG - "@CMake_SOURCE_DIR@/Utilities/Release/cpack_wix_ui_dialog.jpg" + "@CMake_SOURCE_DIR@/Utilities/Release/WiX/ui_dialog.jpg" ) + + set(CPACK_WIX_EXTRA_SOURCES + "@CMake_SOURCE_DIR@/Utilities/Release/WiX/install_dir.wxs" + "@CMake_SOURCE_DIR@/Utilities/Release/WiX/cmake_extra_dialog.wxs" + ) + + set(CPACK_WIX_UI_REF "CMakeUI_InstallDir") + + set(CPACK_WIX_PATCH_FILE + "@CMake_SOURCE_DIR@/Utilities/Release/WiX/patch_path_env.xml" + ) + + set(CPACK_WIX_TEMPLATE + "@CMake_SOURCE_DIR@/Utilities/Release/WiX/WIX.template.in" + ) + + set(BUILD_QtDialog "@BUILD_QtDialog@") + + if(BUILD_QtDialog) + list(APPEND CPACK_WIX_PATCH_FILE + "@CMake_SOURCE_DIR@/Utilities/Release/WiX/patch_desktop_shortcut.xml" + ) + + set(CPACK_WIX_CANDLE_EXTRA_FLAGS "-dBUILD_QtDialog=1") + endif() endif() |