From fab25686245f57e1d39a3f07f10eb28081074a1e Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Wed, 24 Aug 2016 16:16:16 -0700 Subject: [PATCH] always remove the resources dir, make client required --- cmake/macros/GenerateInstallers.cmake | 3 +++ cmake/templates/NSIS.template.in | 8 ++------ 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/cmake/macros/GenerateInstallers.cmake b/cmake/macros/GenerateInstallers.cmake index 0def701739..d0da908554 100644 --- a/cmake/macros/GenerateInstallers.cmake +++ b/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 diff --git a/cmake/templates/NSIS.template.in b/cmake/templates/NSIS.template.in index abecf0fc62..29e3869abe 100644 --- a/cmake/templates/NSIS.template.in +++ b/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@