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 4a0ae3f3f73c366f7b816daa4807f7a009680636 (commit) via 1b91e010bccaf1c93574c04197fb1e8b75b6c50a (commit) from 058d2e992e37946469ca7559c4d1188ec7018eba (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=4a0ae3f3f73c366f7b816daa4807f7a009680636 commit 4a0ae3f3f73c366f7b816daa4807f7a009680636 Merge: 058d2e9 1b91e01 Author: Brad King <brad.k...@kitware.com> AuthorDate: Mon Dec 5 10:11:56 2016 -0500 Commit: CMake Topic Stage <kwro...@kitware.com> CommitDate: Mon Dec 5 10:11:56 2016 -0500 Merge topic 'wix-reg-install-dir' into next 1b91e010 Utilities/Release: Store WiX CMake install location in Windows registry https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1b91e010bccaf1c93574c04197fb1e8b75b6c50a commit 1b91e010bccaf1c93574c04197fb1e8b75b6c50a Author: Nils Gladitz <nilsglad...@gmail.com> AuthorDate: Mon Dec 5 16:05:19 2016 +0100 Commit: Nils Gladitz <nilsglad...@gmail.com> CommitDate: Mon Dec 5 16:05:19 2016 +0100 Utilities/Release: Store WiX CMake install location in Windows registry diff --git a/Utilities/Release/WiX/WIX.template.in b/Utilities/Release/WiX/WIX.template.in index 094999f..fe176ca 100644 --- a/Utilities/Release/WiX/WIX.template.in +++ b/Utilities/Release/WiX/WIX.template.in @@ -36,7 +36,18 @@ <WixVariable Id="WixUIDialogBmp" Value="$(var.CPACK_WIX_UI_DIALOG)"/> <?endif?> - <FeatureRef Id="ProductFeature"/> + <DirectoryRef Id="TARGETDIR"> + <Component Id="CMakeRegistry"> + <RegistryKey Root="HKLM" Key="Software\Kitware\CMake"> + <RegistryValue Type="string" Name="InstallDir" + Value="[INSTALL_ROOT]" KeyPath="yes"/> + </RegistryKey> + </Component> + </DirectoryRef> + + <FeatureRef Id="ProductFeature"> + <ComponentRef Id="CMakeRegistry"/> + </FeatureRef> <UIRef Id="$(var.CPACK_WIX_UI_REF)" /> ----------------------------------------------------------------------- Summary of changes: Utilities/Release/WiX/WIX.template.in | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) hooks/post-receive -- CMake _______________________________________________ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits