浏览代码

CPackIFW: Improve warning and docs for show page list option

Craig Scott 4 年之前
父节点
当前提交
d16830324f
共有 2 个文件被更改,包括 8 次插入4 次删除
  1. 3 1
      Help/cpack_gen/ifw.rst
  2. 5 3
      Source/CPack/IFW/cmCPackIFWInstaller.cxx

+ 3 - 1
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
 

+ 5 - 3
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);
     }
   }