always remove the resources dir, make client required

cmake/macros/GenerateInstallers.cmake

@@ -24,6 +24,9 @@ macro(GENERATE_INSTALLERS)
   set(CPACK_NSIS_PACKAGE_NAME ${_DISPLAY_NAME})
   set(CPACK_PACKAGE_INSTALL_DIRECTORY ${_DISPLAY_NAME})
 
+  # make the Interface client a required component
+  set(CPACK_COMPONENT_${CLIENT_COMPONENT}_REQUIRED TRUE)
+
   if (WIN32)
     # include CMake module that will install compiler system libraries
     # so that we have msvcr120 and msvcp120 installed with targets

cmake/templates/NSIS.template.in

@@ -245,12 +245,8 @@ FunctionEnd
 ; Installation types
 
 Section "-Previous Install Cleanup"
-
-  ${If} ${SectionIsSelected} ${@CLIENT_COMPONENT_NAME@}
-    ; Remove the resources folder so we don't end up including removed QML files
-    RMDir /r "$INSTDIR\resources"
-  ${EndIf}
-
+  ; Remove the resources folder so we don't end up including removed QML files
+  RMDir /r "$INSTDIR\resources"
 SectionEnd
 
 @CPACK_NSIS_INSTALLATION_TYPES@