From d16830324f747653b9f464abd20d22fee2ed4109 Mon Sep 17 00:00:00 2001 From: Craig Scott Date: Sun, 14 Feb 2021 15:33:45 +1100 Subject: CPackIFW: Improve warning and docs for show page list option --- Help/cpack_gen/ifw.rst | 4 +++- Source/CPack/IFW/cmCPackIFWInstaller.cxx | 8 +++++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/Help/cpack_gen/ifw.rst b/Help/cpack_gen/ifw.rst index a940a95..6817eac 100644 --- a/Help/cpack_gen/ifw.rst +++ b/Help/cpack_gen/ifw.rst @@ -111,9 +111,11 @@ Package .. variable:: CPACK_IFW_PACKAGE_WIZARD_SHOW_PAGE_LIST + .. versionadded:: 3.20 + Set to ``OFF`` if the widget listing installer pages on the left side of the wizard should not be shown. - Is ``ON`` by default. + It is ``ON`` by default, but will only have an effect if using QtIFW 4.0 or later. .. variable:: CPACK_IFW_PACKAGE_TITLE_COLOR diff --git a/Source/CPack/IFW/cmCPackIFWInstaller.cxx b/Source/CPack/IFW/cmCPackIFWInstaller.cxx index d3c39e8..e0dd06b 100644 --- a/Source/CPack/IFW/cmCPackIFWInstaller.cxx +++ b/Source/CPack/IFW/cmCPackIFWInstaller.cxx @@ -188,9 +188,11 @@ void cmCPackIFWInstaller::ConfigureFromOptions() } else { cmCPackIFWLogger( WARNING, - "Option CPACK_IFW_PACKAGE_WIZARD_SHOW_PAGE_LIST is set to value \"" - << option << "\". But has no any effect for QtIFW less than 4.0 " - << "and will be skipped." << std::endl); + "Option CPACK_IFW_PACKAGE_WIZARD_SHOW_PAGE_LIST is set to \"" + << option + << "\", but it is only supported with QtIFW version 4.0 or later. " + "It is being ignored because you are using QtIFW version " + << this->Generator->FrameworkVersion.data() << std::endl); } } -- cgit v0.12