From a49d610063106863f924163ed59deb559397bb23 Mon Sep 17 00:00:00 2001 From: James Donald Date: Thu, 11 Aug 2016 20:44:24 -0700 Subject: [PATCH 1/2] Hide default printouts under a debug flag --- standard/CombinedInstaller.cmake | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/standard/CombinedInstaller.cmake b/standard/CombinedInstaller.cmake index 60292f055..ae7f99f66 100644 --- a/standard/CombinedInstaller.cmake +++ b/standard/CombinedInstaller.cmake @@ -1,4 +1,4 @@ -# Utility for creating a combined installer for Windows +## Utility for creating a combined installer for Windows # # This utility allows a WIX installer to be created with a single PACKAGE command, # and allows both 32 and 64 variants of the installer to be installed on a system @@ -34,7 +34,9 @@ include(DefaultValue) include(ParseVersion) function(combined_installer) - message("Project name is ${CMAKE_PROJECT_NAME}") + if(COMBINED_INSTALLER_DEBUG) + message("Project name is ${CMAKE_PROJECT_NAME}") + endif() set(options ) set(oneValueArgs NAME VENDOR CONTACT VERSION GUID LICENSE README WIXFILE) @@ -97,7 +99,9 @@ function(combined_installer) # # For more information on the rationale for this process, see the discussion on semantic versioning # found at http://semver.org/ - message("Upgrade GUID is ${ARG_GUID}") + if(COMBINED_INSTALLER_DEBUG) + message("Upgrade GUID is ${ARG_GUID}") + endif() set(CPACK_WIX_UPGRADE_GUID "{${ARG_GUID}}") # Need a custom wix installation template so that we update the CMake package registry correctly From 33e291cbde4244f908bfc6db1e03802417137bf7 Mon Sep 17 00:00:00 2001 From: James Donald Date: Thu, 11 Aug 2016 20:45:08 -0700 Subject: [PATCH 2/2] Undo a stray pound sign --- standard/CombinedInstaller.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/standard/CombinedInstaller.cmake b/standard/CombinedInstaller.cmake index ae7f99f66..d6923afc1 100644 --- a/standard/CombinedInstaller.cmake +++ b/standard/CombinedInstaller.cmake @@ -1,4 +1,4 @@ -## Utility for creating a combined installer for Windows +# Utility for creating a combined installer for Windows # # This utility allows a WIX installer to be created with a single PACKAGE command, # and allows both 32 and 64 variants of the installer to be installed on a system