From 45d16731c3a0a14673dea66160c7a9e6b7b42f06 Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Fri, 16 Mar 2018 13:48:02 -0700
Subject: [PATCH] fix abort of setup options page for express client

---
 cmake/templates/NSIS.template.in | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/cmake/templates/NSIS.template.in b/cmake/templates/NSIS.template.in
index c2a223146d..5a7dd3ced3 100644
--- a/cmake/templates/NSIS.template.in
+++ b/cmake/templates/NSIS.template.in
@@ -437,6 +437,12 @@ SectionEnd
   !define MUI_PAGE_CUSTOMFUNCTION_PRE PageComponentsPre
   @CPACK_NSIS_PAGE_COMPONENTS@
 
+  ; the MUI_PAGE_CUSTOMFUNCTION_PRE shouldn't be defined here
+  ; which can happen for a component-less (like client only) install
+  !ifdef MUI_PAGE_CUSTOMFUNCTION_PRE
+  !undef MUI_PAGE_CUSTOMFUNCTION_PRE
+  !endif
+
   Page custom PostInstallOptionsPage ReadPostInstallOptions
 
   !define MUI_PAGE_CUSTOMFUNCTION_PRE PageInstallFilesPre