diff options
| author | Brad King <brad.king@kitware.com> | 2021-02-15 15:32:15 +0000 |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2021-02-15 10:32:20 -0500 |
| commit | 7f2203ab4ad131e831b0574bb79a0ccb65126b14 (patch) | |
| tree | 4c26af6e63d36df1acb3b6eceba0509c53fa8614 /Source | |
| parent | c1e90c55448b62fd65521ae3b45f9cf043b05779 (diff) | |
| parent | 7c147b21c7cf806f817bbfb45f385734dd836d91 (diff) | |
| download | cmake-7f2203ab4ad131e831b0574bb79a0ccb65126b14.tar.gz | |
Merge topic 'release-3.20-cleanups' into release-3.20
7c147b21c7 Help: Add Ninja Multi-Config and make generator types into links
5039ca1126 Help: Convert output directory variable mentions to cross-references
1a7e51b9d5 Help: Cleanup wording and links in 3.20 release notes
d16830324f CPackIFW: Improve warning and docs for show page list option
7ed7db88a4 CPackIFW: Fix cppcheck warnings
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5810
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/CPack/IFW/cmCPackIFWInstaller.cxx | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/Source/CPack/IFW/cmCPackIFWInstaller.cxx b/Source/CPack/IFW/cmCPackIFWInstaller.cxx index 359fc56b15..e0dd06b482 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); } } @@ -275,9 +277,8 @@ void cmCPackIFWInstaller::ConfigureFromOptions() class cmCPackIFWResourcesParser : public cmXMLParser { public: - cmCPackIFWResourcesParser(cmCPackIFWInstaller* i) + explicit cmCPackIFWResourcesParser(cmCPackIFWInstaller* i) : installer(i) - , file(false) { this->path = i->Directory + "/resources"; } @@ -296,7 +297,9 @@ public: } cmCPackIFWInstaller* installer; - bool file, hasFiles, hasErrors; + bool file = false; + bool hasFiles = false; + bool hasErrors = false; std::string path, basePath; protected: |