diff options
| author | Brad King <brad.king@kitware.com> | 2024-03-28 13:01:59 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2024-03-28 19:19:18 (GMT) |
| commit | d320c76257febde76728ba53468b349d56d9f0fe (patch) | |
| tree | 7a199eb7f3f39dbc36c345f734c2597683df51d8 /Utilities | |
| parent | cde0b7c13133754fd7fa7cdc45c7c69e0d17a1eb (diff) | |
| download | CMake-d320c76257febde76728ba53468b349d56d9f0fe.zip CMake-d320c76257febde76728ba53468b349d56d9f0fe.tar.gz CMake-d320c76257febde76728ba53468b349d56d9f0fe.tar.bz2 | |
Utilities/Release/WiX: Clarify UI options dialog name
Diffstat (limited to 'Utilities')
| -rw-r--r-- | Utilities/Release/WiX/install_dir.wxs | 10 | ||||
| -rw-r--r-- | Utilities/Release/WiX/options_dlg.wxs (renamed from Utilities/Release/WiX/cmake_extra_dialog.wxs) | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/Utilities/Release/WiX/install_dir.wxs b/Utilities/Release/WiX/install_dir.wxs index fd756b9..d7debde 100644 --- a/Utilities/Release/WiX/install_dir.wxs +++ b/Utilities/Release/WiX/install_dir.wxs @@ -8,7 +8,7 @@ <Property Id="DefaultUIFont" Value="WixUI_Font_Normal" /> <Property Id="WixUI_Mode" Value="InstallDir" /> - <DialogRef Id="CMakeExtraDialog" /> + <DialogRef Id="CMakeOptionsDlg" /> <?ifdef CHECK_NSIS ?> <DialogRef Id="CMakeNsisOverwriteDialog" /> <?endif ?> @@ -33,12 +33,12 @@ <Publish Dialog="WelcomeDlg" Control="Next" Event="NewDialog" Value="VerifyReadyDlg">Installed AND PATCH</Publish> <Publish Dialog="LicenseAgreementDlg" Control="Back" Event="NewDialog" Value="WelcomeDlg">1</Publish> - <Publish Dialog="LicenseAgreementDlg" Control="Next" Event="NewDialog" Value="CMakeExtraDialog">LicenseAccepted = "1"</Publish> + <Publish Dialog="LicenseAgreementDlg" Control="Next" Event="NewDialog" Value="CMakeOptionsDlg">LicenseAccepted = "1"</Publish> - <Publish Dialog="CMakeExtraDialog" Control="Back" Event="NewDialog" Value="LicenseAgreementDlg">1</Publish> - <Publish Dialog="CMakeExtraDialog" Control="Next" Event="NewDialog" Value="InstallDirDlg">1</Publish> + <Publish Dialog="CMakeOptionsDlg" Control="Back" Event="NewDialog" Value="LicenseAgreementDlg">1</Publish> + <Publish Dialog="CMakeOptionsDlg" Control="Next" Event="NewDialog" Value="InstallDirDlg">1</Publish> - <Publish Dialog="InstallDirDlg" Control="Back" Event="NewDialog" Value="CMakeExtraDialog">1</Publish> + <Publish Dialog="InstallDirDlg" Control="Back" Event="NewDialog" Value="CMakeOptionsDlg">1</Publish> <Publish Dialog="InstallDirDlg" Control="Next" Event="SetTargetPath" Value="[WIXUI_INSTALLDIR]" Order="1">1</Publish> <Publish Dialog="InstallDirDlg" Control="Next" Event="DoAction" Value="WixUIValidatePath" Order="2">NOT WIXUI_DONTVALIDATEPATH</Publish> <Publish Dialog="InstallDirDlg" Control="Next" Event="SpawnDialog" Value="InvalidDirDlg" Order="3"><![CDATA[NOT WIXUI_DONTVALIDATEPATH AND WIXUI_INSTALLDIR_VALID<>"1"]]></Publish> diff --git a/Utilities/Release/WiX/cmake_extra_dialog.wxs b/Utilities/Release/WiX/options_dlg.wxs index 247b627..c8f5a7b 100644 --- a/Utilities/Release/WiX/cmake_extra_dialog.wxs +++ b/Utilities/Release/WiX/options_dlg.wxs @@ -2,7 +2,7 @@ <Fragment> <UI> <Property Id="ADD_CMAKE_TO_PATH" Value="None"/> - <Dialog Id="CMakeExtraDialog" Width="370" Height="270" Title="Install Options"> + <Dialog Id="CMakeOptionsDlg" Width="370" Height="270" Title="Install Options"> <Control Id="Next" Type="PushButton" X="236" Y="243" Width="56" Height="17" Default="yes" Text="!(loc.WixUINext)"/> <Control Id="Back" Type="PushButton" X="180" Y="243" Width="56" Height="17" Text="!(loc.WixUIBack)"/> |