diff options
| author | Brad King <brad.king@kitware.com> | 2016-12-06 14:26:12 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2016-12-06 14:26:12 (GMT) |
| commit | 9cf5fe22d0ac51a45d99823820a100ea02ab4305 (patch) | |
| tree | dcd4e09b82c6204e8e53e995226ca0bff9a5392c | |
| parent | d6a1e2b90b40b8947141a1ab6ea4e7c5051d78c5 (diff) | |
| parent | 4beaa926b3f290c10824b2d04cd94fd44a9489d1 (diff) | |
| download | CMake-9cf5fe22d0ac51a45d99823820a100ea02ab4305.zip CMake-9cf5fe22d0ac51a45d99823820a100ea02ab4305.tar.gz CMake-9cf5fe22d0ac51a45d99823820a100ea02ab4305.tar.bz2 | |
Merge topic 'wix-reg-install-dir'
4beaa926 Help: Add notes for topic 'wix-reg-install-dir'
1b91e010 Utilities/Release: Store WiX CMake install location in Windows registry
| -rw-r--r-- | Help/release/dev/wix-reg-install-dir.rst | 6 | ||||
| -rw-r--r-- | Utilities/Release/WiX/WIX.template.in | 13 |
2 files changed, 18 insertions, 1 deletions
diff --git a/Help/release/dev/wix-reg-install-dir.rst b/Help/release/dev/wix-reg-install-dir.rst new file mode 100644 index 0000000..961fad2 --- /dev/null +++ b/Help/release/dev/wix-reg-install-dir.rst @@ -0,0 +1,6 @@ +wix-reg-install-dir +------------------- + +* The precompiled Windows binary MSI package provided on ``cmake.org`` now + records the installation directory in the Windows Registry under the key + ``HKLM\Software\Kitware\CMake`` with a value named ``InstallDir``. 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)" /> |