From 20777bd19a11e99987da52e62469d479e27df819 Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Thu, 25 Aug 2016 15:50:13 -0700
Subject: [PATCH] force default selection of client on install

---
 cmake/macros/GenerateInstallers.cmake | 2 +-
 cmake/templates/NSIS.template.in      | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/cmake/macros/GenerateInstallers.cmake b/cmake/macros/GenerateInstallers.cmake
index 34997a21c8..0def701739 100644
--- a/cmake/macros/GenerateInstallers.cmake
+++ b/cmake/macros/GenerateInstallers.cmake
@@ -85,7 +85,7 @@ macro(GENERATE_INSTALLERS)
 
   set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_SOURCE_DIR}/LICENSE")
 
-  cpack_add_component(${CLIENT_COMPONENT} DISPLAY_NAME "High Fidelity Interface" REQUIRED)
+  cpack_add_component(${CLIENT_COMPONENT} DISPLAY_NAME "High Fidelity Interface")
   cpack_add_component(${SERVER_COMPONENT} DISPLAY_NAME "High Fidelity Sandbox")
 
   include(CPack)
diff --git a/cmake/templates/NSIS.template.in b/cmake/templates/NSIS.template.in
index 29e3869abe..94f77a35c0 100644
--- a/cmake/templates/NSIS.template.in
+++ b/cmake/templates/NSIS.template.in
@@ -129,6 +129,11 @@ Var AR_RegFlags
   ;Writing modified flags
   SectionSetFlags ${${SecName}} $AR_SecFlags
 
+  ; The client is always selected by default
+  ${If} ${SecName} == @CLIENT_COMPONENT_NAME@
+    SectionSetFlags ${${SecName}} 17
+  ${EndIf}
+
  "default_${SecName}:"
  !insertmacro LoadSectionSelectedIntoVar ${SecName} ${SecName}_selected
 !macroend