From 7ed7db88a4c3efb93b0ee21e94aaef94e4d89e9d Mon Sep 17 00:00:00 2001 From: Craig Scott Date: Sun, 14 Feb 2021 15:24:25 +1100 Subject: CPackIFW: Fix cppcheck warnings The cppcheck warnings about uninitialised variables are likely harmless, since they are initialised in ParseResource() anyway. Fix the warnings anyway to reduce linting noise. The warning about a single argument non-explicit constructor is worth fixing in general. --- Source/CPack/IFW/cmCPackIFWInstaller.cxx | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Source/CPack/IFW/cmCPackIFWInstaller.cxx b/Source/CPack/IFW/cmCPackIFWInstaller.cxx index 359fc56..d3c39e8 100644 --- a/Source/CPack/IFW/cmCPackIFWInstaller.cxx +++ b/Source/CPack/IFW/cmCPackIFWInstaller.cxx @@ -275,9 +275,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 +295,9 @@ public: } cmCPackIFWInstaller* installer; - bool file, hasFiles, hasErrors; + bool file = false; + bool hasFiles = false; + bool hasErrors = false; std::string path, basePath; protected: -- cgit v0.12 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 From 1a7e51b9d503e417eb3e5b1848d22bf5668fe9a5 Mon Sep 17 00:00:00 2001 From: Craig Scott Date: Sun, 14 Feb 2021 15:37:55 +1100 Subject: Help: Cleanup wording and links in 3.20 release notes --- Help/release/3.20.rst | 48 +++++++++++++++++++++++++----------------------- 1 file changed, 25 insertions(+), 23 deletions(-) diff --git a/Help/release/3.20.rst b/Help/release/3.20.rst index 4a3ff70..0f0d67b 100644 --- a/Help/release/3.20.rst +++ b/Help/release/3.20.rst @@ -101,16 +101,16 @@ Commands * The :command:`cmake_path` command was added for operations on filesystem paths. -* The :command:`configure_file` command gained a ``USE_SOURCE_PERMISSIONS`` - and ``FILE_PERMISSIONS`` option to support copying of permissions of source - file and specifying user defined permissions. +* The :command:`configure_file` command gained ``USE_SOURCE_PERMISSIONS`` + and ``FILE_PERMISSIONS`` options to support copying of permissions of the + source file and using specified permissions respectively. -* The :command:`file(GENERATE)` command gained ``NEWLINE_STYLE`` option to - support newline style of the generated file. +* The :command:`file(GENERATE)` command gained a ``NEWLINE_STYLE`` option to + specify how newlines are handled for the generated file. * The :command:`file(GENERATE)` command gained ``NO_SOURCE_PERMISSIONS``, - ``USE_SOURCE_PERMISSIONS``, and ``FILE_PERMISSIONS`` options to support - permissions of the generated file. + ``USE_SOURCE_PERMISSIONS``, and ``FILE_PERMISSIONS`` options for controlling + the permissions of the generated file. * The :command:`install(FILES)` command ``RENAME`` option learned to support :manual:`generator expressions `. @@ -169,14 +169,14 @@ Modules ------- * The :module:`ExternalData` module :command:`ExternalData_Add_Target` - function gained a ``SHOW_PROGRESS `` option to suppress progress - output during the build. + function gained a ``SHOW_PROGRESS `` option for controlling whether + or not to show progress output during the build. * The :module:`ExternalProject` module :command:`ExternalProject_Add` function - gained a ``CONFIGURE_HANDLED_BY_BUILD`` option to have subsequent runs of - the configure step be triggered by the build step when an external project - dependency rebuilds instead of always rerunning the configure step when - an external project dependency rebuilds. + gained a ``CONFIGURE_HANDLED_BY_BUILD`` option. This can be used to make + subsequent runs of the configure step be triggered by the build step when + an external project dependency rebuilds instead of always re-running the + configure step in such cases. * The :module:`FindBoost` module gained a ``Boost_NO_WARN_NEW_VERSIONS`` option to silence the warning about unknown dependencies for new @@ -226,7 +226,7 @@ CPack resolving private library dependencies when using ``dpkg-shlibdeps``. -* The :cpack_gen:`CPack IFW Generator` gained new +* The :cpack_gen:`CPack IFW Generator` gained a new :variable:`CPACK_IFW_PACKAGE_WIZARD_SHOW_PAGE_LIST` variable to control visibility of the widget listing installer pages on the left side of the wizard. This feature available only since QtIFW 4.0. @@ -236,9 +236,9 @@ CPack :variable:`CPACK_NSIS_BRANDING_TEXT_TRIM_POSITION` variables to change the text at the bottom of the install window and change its trim position -* The :cpack_gen:`CPack NSIS Generator` now handles correctly Unicode characters. - If you want to have a ``CPACK_RESOURCE_FILE_LICENSE`` with UTF-8 characters - it needs to be encoded in UTF-8 BOM. +* The :cpack_gen:`CPack NSIS Generator` now correctly handles Unicode + characters. If you want to have a :variable:`CPACK_RESOURCE_FILE_LICENSE` + with UTF-8 characters, it needs to be encoded in UTF-8 BOM. * The :cpack_gen:`CPack NuGet Generator` gained options: @@ -319,10 +319,12 @@ Other Changes phase when the required content is already populated and up-to-date. -* The precompiled Linux binaries provided on ``cmake.org`` have changed - their naming pattern to ``cmake-$ver-linux-$arch``, where ``$arch`` - is either ``x86_64`` or ``aarch64``. +* The precompiled Linux binaries provided on + `cmake.org `_ have changed their naming pattern + to ``cmake-$ver-linux-$arch``, where ``$arch`` is either ``x86_64`` or + ``aarch64``. -* The precompiled Windows binaries provided on ``cmake.org`` have changed - their naming pattern to ``cmake-$ver-windows-$arch``, where ``$arch`` - is either ``x86_64`` or ``i386``. +* The precompiled Windows binaries provided on + `cmake.org `_ have changed their naming pattern + to ``cmake-$ver-windows-$arch``, where ``$arch`` is either ``x86_64`` or + ``i386``. -- cgit v0.12 From 5039ca112697e3816a4feef0faf952d2062b08db Mon Sep 17 00:00:00 2001 From: Craig Scott Date: Sun, 14 Feb 2021 15:39:29 +1100 Subject: Help: Convert output directory variable mentions to cross-references --- Help/prop_tgt/ARCHIVE_OUTPUT_DIRECTORY.rst | 2 +- Help/prop_tgt/LIBRARY_OUTPUT_DIRECTORY.rst | 2 +- Help/prop_tgt/RUNTIME_OUTPUT_DIRECTORY.rst | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Help/prop_tgt/ARCHIVE_OUTPUT_DIRECTORY.rst b/Help/prop_tgt/ARCHIVE_OUTPUT_DIRECTORY.rst index 4221069..677e06d 100644 --- a/Help/prop_tgt/ARCHIVE_OUTPUT_DIRECTORY.rst +++ b/Help/prop_tgt/ARCHIVE_OUTPUT_DIRECTORY.rst @@ -3,7 +3,7 @@ ARCHIVE_OUTPUT_DIRECTORY .. |XXX| replace:: :ref:`ARCHIVE ` .. |xxx| replace:: archive -.. |CMAKE_XXX_OUTPUT_DIRECTORY| replace:: CMAKE_ARCHIVE_OUTPUT_DIRECTORY +.. |CMAKE_XXX_OUTPUT_DIRECTORY| replace:: :variable:`CMAKE_ARCHIVE_OUTPUT_DIRECTORY` .. include:: XXX_OUTPUT_DIRECTORY.txt See also the :prop_tgt:`ARCHIVE_OUTPUT_DIRECTORY_` target property. diff --git a/Help/prop_tgt/LIBRARY_OUTPUT_DIRECTORY.rst b/Help/prop_tgt/LIBRARY_OUTPUT_DIRECTORY.rst index 785a57b..9fbe904 100644 --- a/Help/prop_tgt/LIBRARY_OUTPUT_DIRECTORY.rst +++ b/Help/prop_tgt/LIBRARY_OUTPUT_DIRECTORY.rst @@ -3,7 +3,7 @@ LIBRARY_OUTPUT_DIRECTORY .. |XXX| replace:: :ref:`LIBRARY ` .. |xxx| replace:: library -.. |CMAKE_XXX_OUTPUT_DIRECTORY| replace:: CMAKE_LIBRARY_OUTPUT_DIRECTORY +.. |CMAKE_XXX_OUTPUT_DIRECTORY| replace:: :variable:`CMAKE_LIBRARY_OUTPUT_DIRECTORY` .. include:: XXX_OUTPUT_DIRECTORY.txt See also the :prop_tgt:`LIBRARY_OUTPUT_DIRECTORY_` target property. diff --git a/Help/prop_tgt/RUNTIME_OUTPUT_DIRECTORY.rst b/Help/prop_tgt/RUNTIME_OUTPUT_DIRECTORY.rst index 12390f5..3c37546 100644 --- a/Help/prop_tgt/RUNTIME_OUTPUT_DIRECTORY.rst +++ b/Help/prop_tgt/RUNTIME_OUTPUT_DIRECTORY.rst @@ -3,7 +3,7 @@ RUNTIME_OUTPUT_DIRECTORY .. |XXX| replace:: :ref:`RUNTIME ` .. |xxx| replace:: runtime -.. |CMAKE_XXX_OUTPUT_DIRECTORY| replace:: CMAKE_RUNTIME_OUTPUT_DIRECTORY +.. |CMAKE_XXX_OUTPUT_DIRECTORY| replace:: :variable:`CMAKE_RUNTIME_OUTPUT_DIRECTORY` .. include:: XXX_OUTPUT_DIRECTORY.txt See also the :prop_tgt:`RUNTIME_OUTPUT_DIRECTORY_` target property. -- cgit v0.12 From 7c147b21c7cf806f817bbfb45f385734dd836d91 Mon Sep 17 00:00:00 2001 From: Craig Scott Date: Sun, 14 Feb 2021 15:41:49 +1100 Subject: Help: Add Ninja Multi-Config and make generator types into links --- Help/prop_tgt/XXX_OUTPUT_DIRECTORY.txt | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/Help/prop_tgt/XXX_OUTPUT_DIRECTORY.txt b/Help/prop_tgt/XXX_OUTPUT_DIRECTORY.txt index 3ae5448..d38a96e 100644 --- a/Help/prop_tgt/XXX_OUTPUT_DIRECTORY.txt +++ b/Help/prop_tgt/XXX_OUTPUT_DIRECTORY.txt @@ -3,9 +3,10 @@ Output directory in which to build |XXX| target files. This property specifies the directory into which |xxx| target files should be built. The property value may use :manual:`generator expressions `. -Multi-configuration generators (VS, Xcode) append a per-configuration -subdirectory to the specified directory unless a generator expression -is used. +Multi-configuration generators (:ref:`Visual Studio `, +:generator:`Xcode`, :generator:`Ninja Multi-Config`) append a +per-configuration subdirectory to the specified directory unless a generator +expression is used. -This property is initialized by the value of the variable -|CMAKE_XXX_OUTPUT_DIRECTORY| if it is set when a target is created. +This property is initialized by the value of the +|CMAKE_XXX_OUTPUT_DIRECTORY| variable if it is set when a target is created. -- cgit v0.12