summaryrefslogtreecommitdiffstats
path: root/Utilities
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2024-03-28 15:24:01 (GMT)
committerBrad King <brad.king@kitware.com>2024-03-28 19:19:17 (GMT)
commit48d2a7ac62a5d5e9fcdde89aaad00e0256d5afe0 (patch)
tree94adbb6df9ccacaa214611c8ed7a3e7d8ea450dd /Utilities
parent36ae046ed10a42b3bdea4695926ce52b0fb52828 (diff)
downloadCMake-48d2a7ac62a5d5e9fcdde89aaad00e0256d5afe0.zip
CMake-48d2a7ac62a5d5e9fcdde89aaad00e0256d5afe0.tar.gz
CMake-48d2a7ac62a5d5e9fcdde89aaad00e0256d5afe0.tar.bz2
Utilities/Release/WiX: Backport UI dialog condition fix from WiX 3.11
See WiX issue 4737 and wix3 PR 284.
Diffstat (limited to 'Utilities')
-rw-r--r--Utilities/Release/WiX/install_dir.wxs2
1 files changed, 1 insertions, 1 deletions
diff --git a/Utilities/Release/WiX/install_dir.wxs b/Utilities/Release/WiX/install_dir.wxs
index b0e795a..ec64edf 100644
--- a/Utilities/Release/WiX/install_dir.wxs
+++ b/Utilities/Release/WiX/install_dir.wxs
@@ -25,7 +25,7 @@
<DialogRef Id="UserExit" />
<Publish Dialog="BrowseDlg" Control="OK" Event="DoAction" Value="WixUIValidatePath" Order="3">1</Publish>
- <Publish Dialog="BrowseDlg" Control="OK" Event="SpawnDialog" Value="InvalidDirDlg" Order="4"><![CDATA[WIXUI_INSTALLDIR_VALID<>"1"]]></Publish>
+ <Publish Dialog="BrowseDlg" Control="OK" Event="SpawnDialog" Value="InvalidDirDlg" Order="4"><![CDATA[NOT WIXUI_DONTVALIDATEPATH AND WIXUI_INSTALLDIR_VALID<>"1"]]></Publish>
<Publish Dialog="ExitDialog" Control="Finish" Event="EndDialog" Value="Return" Order="999">1</Publish>