This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "CMake".
The branch, next has been updated via 3d5ec083460e03b1ad57baa90cddbc543233f3fa (commit) via 95224b2152c8df6869f02f04a1f741f5607b111f (commit) from d75e40d647d3d8869d375455a64a78aa0eca4f93 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3d5ec083460e03b1ad57baa90cddbc543233f3fa commit 3d5ec083460e03b1ad57baa90cddbc543233f3fa Merge: d75e40d 95224b2 Author: Nils Gladitz <nilsglad...@gmail.com> AuthorDate: Mon Dec 14 14:59:59 2015 -0500 Commit: CMake Topic Stage <kwro...@kitware.com> CommitDate: Mon Dec 14 14:59:59 2015 -0500 Merge topic 'release-wix-config-ng' into next 95224b21 CMake: !fixup Support building WiX installer without Qt Dialog https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=95224b2152c8df6869f02f04a1f741f5607b111f commit 95224b2152c8df6869f02f04a1f741f5607b111f Author: Nils Gladitz <nilsglad...@gmail.com> AuthorDate: Mon Dec 14 20:58:59 2015 +0100 Commit: Nils Gladitz <nilsglad...@gmail.com> CommitDate: Mon Dec 14 20:58:59 2015 +0100 CMake: !fixup Support building WiX installer without Qt Dialog diff --git a/CMakeCPackOptions.cmake.in b/CMakeCPackOptions.cmake.in index eb36015..0562732 100644 --- a/CMakeCPackOptions.cmake.in +++ b/CMakeCPackOptions.cmake.in @@ -249,6 +249,14 @@ if("${CPACK_GENERATOR}" STREQUAL "WIX") set(CPACK_WIX_UI_REF "CMakeUI_InstallDir") set(CPACK_WIX_PATCH_FILE - "@CMake_SOURCE_DIR@/Utilities/Release/WiX/patch.xml" + "@CMake_SOURCE_DIR@/Utilities/Release/WiX/patch_path_env.xml" ) + + set(BUILD_QtDialog "@BUILD_QtDialog@") + + if(BUILD_QtDialog) + list(APPEND CPACK_WIX_PATCH_FILE + "@CMake_SOURCE_DIR@/Utilities/Release/WiX/patch_desktop_shortcut.xml" + ) + endif() endif() diff --git a/Utilities/Release/WiX/patch_desktop_shortcut.xml b/Utilities/Release/WiX/patch_desktop_shortcut.xml new file mode 100644 index 0000000..d30705d --- /dev/null +++ b/Utilities/Release/WiX/patch_desktop_shortcut.xml @@ -0,0 +1,5 @@ +<CPackWiXPatch> + <CPackWiXFragment Id="CM_SHORTCUT_DESKTOP"> + <Condition>DESKTOP_SHORTCUT_REQUESTED = 1</Condition> + </CPackWiXFragment> +</CPackWiXPatch> diff --git a/Utilities/Release/WiX/patch.xml b/Utilities/Release/WiX/patch_path_env.xml similarity index 87% rename from Utilities/Release/WiX/patch.xml rename to Utilities/Release/WiX/patch_path_env.xml index 666c7ac..0e335c4 100644 --- a/Utilities/Release/WiX/patch.xml +++ b/Utilities/Release/WiX/patch_path_env.xml @@ -1,8 +1,4 @@ <CPackWiXPatch> - <CPackWiXFragment Id="CM_SHORTCUT_DESKTOP"> - <Condition>DESKTOP_SHORTCUT_REQUESTED = 1</Condition> - </CPackWiXFragment> - <CPackWiXFragment Id="CM_DP_bin"> <Component Id="CMakeSystemPathEntryCMP" KeyPath="yes" Guid="0E782367-5D68-4539-81D1-B9757AE496A1"> ----------------------------------------------------------------------- Summary of changes: CMakeCPackOptions.cmake.in | 10 +++++++++- Utilities/Release/WiX/patch_desktop_shortcut.xml | 5 +++++ Utilities/Release/WiX/{patch.xml => patch_path_env.xml} | 4 ---- 3 files changed, 14 insertions(+), 5 deletions(-) create mode 100644 Utilities/Release/WiX/patch_desktop_shortcut.xml rename Utilities/Release/WiX/{patch.xml => patch_path_env.xml} (87%) hooks/post-receive -- CMake _______________________________________________ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits