Commit 7f2203ab authored by Brad King's avatar Brad King Committed by Kitware Robot
Browse files

Merge topic 'release-3.20-cleanups' into release-3.20

7c147b21 Help: Add Ninja Multi-Config and make generator types into links
5039ca11 Help: Convert output directory variable mentions to cross-references
1a7e51b9 Help: Cleanup wording and links in 3.20 release notes
d1683032 CPackIFW: Improve warning and docs for show page list option
7ed7db88

 CPackIFW: Fix cppcheck warnings
Acked-by: Kitware Robot's avatarKitware Robot <kwrobot@kitware.com>
Merge-request: !5810
parents c1e90c55 7c147b21
Pipeline #214433 passed with stages
in 64 minutes and 8 seconds
...@@ -111,9 +111,11 @@ Package ...@@ -111,9 +111,11 @@ Package
.. variable:: CPACK_IFW_PACKAGE_WIZARD_SHOW_PAGE_LIST .. 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. 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 .. variable:: CPACK_IFW_PACKAGE_TITLE_COLOR
......
...@@ -3,7 +3,7 @@ ARCHIVE_OUTPUT_DIRECTORY ...@@ -3,7 +3,7 @@ ARCHIVE_OUTPUT_DIRECTORY
.. |XXX| replace:: :ref:`ARCHIVE <Archive Output Artifacts>` .. |XXX| replace:: :ref:`ARCHIVE <Archive Output Artifacts>`
.. |xxx| replace:: 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 .. include:: XXX_OUTPUT_DIRECTORY.txt
See also the :prop_tgt:`ARCHIVE_OUTPUT_DIRECTORY_<CONFIG>` target property. See also the :prop_tgt:`ARCHIVE_OUTPUT_DIRECTORY_<CONFIG>` target property.
...@@ -3,7 +3,7 @@ LIBRARY_OUTPUT_DIRECTORY ...@@ -3,7 +3,7 @@ LIBRARY_OUTPUT_DIRECTORY
.. |XXX| replace:: :ref:`LIBRARY <Library Output Artifacts>` .. |XXX| replace:: :ref:`LIBRARY <Library Output Artifacts>`
.. |xxx| replace:: 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 .. include:: XXX_OUTPUT_DIRECTORY.txt
See also the :prop_tgt:`LIBRARY_OUTPUT_DIRECTORY_<CONFIG>` target property. See also the :prop_tgt:`LIBRARY_OUTPUT_DIRECTORY_<CONFIG>` target property.
...@@ -3,7 +3,7 @@ RUNTIME_OUTPUT_DIRECTORY ...@@ -3,7 +3,7 @@ RUNTIME_OUTPUT_DIRECTORY
.. |XXX| replace:: :ref:`RUNTIME <Runtime Output Artifacts>` .. |XXX| replace:: :ref:`RUNTIME <Runtime Output Artifacts>`
.. |xxx| replace:: 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 .. include:: XXX_OUTPUT_DIRECTORY.txt
See also the :prop_tgt:`RUNTIME_OUTPUT_DIRECTORY_<CONFIG>` target property. See also the :prop_tgt:`RUNTIME_OUTPUT_DIRECTORY_<CONFIG>` target property.
...@@ -3,9 +3,10 @@ Output directory in which to build |XXX| target files. ...@@ -3,9 +3,10 @@ Output directory in which to build |XXX| target files.
This property specifies the directory into which |xxx| target files This property specifies the directory into which |xxx| target files
should be built. The property value may use should be built. The property value may use
:manual:`generator expressions <cmake-generator-expressions(7)>`. :manual:`generator expressions <cmake-generator-expressions(7)>`.
Multi-configuration generators (VS, Xcode) append a per-configuration Multi-configuration generators (:ref:`Visual Studio <Visual Studio Generators>`,
subdirectory to the specified directory unless a generator expression :generator:`Xcode`, :generator:`Ninja Multi-Config`) append a
is used. per-configuration subdirectory to the specified directory unless a generator
expression is used.
This property is initialized by the value of the variable This property is initialized by the value of the
|CMAKE_XXX_OUTPUT_DIRECTORY| if it is set when a target is created. |CMAKE_XXX_OUTPUT_DIRECTORY| variable if it is set when a target is created.
...@@ -103,16 +103,16 @@ Commands ...@@ -103,16 +103,16 @@ Commands
* The :command:`cmake_path` command was added for operations on * The :command:`cmake_path` command was added for operations on
filesystem paths. filesystem paths.
* The :command:`configure_file` command gained a ``USE_SOURCE_PERMISSIONS`` * The :command:`configure_file` command gained ``USE_SOURCE_PERMISSIONS``
and ``FILE_PERMISSIONS`` option to support copying of permissions of source and ``FILE_PERMISSIONS`` options to support copying of permissions of the
file and specifying user defined permissions. source file and using specified permissions respectively.
* The :command:`file(GENERATE)` command gained ``NEWLINE_STYLE`` option to * The :command:`file(GENERATE)` command gained a ``NEWLINE_STYLE`` option to
support newline style of the generated file. specify how newlines are handled for the generated file.
* The :command:`file(GENERATE)` command gained ``NO_SOURCE_PERMISSIONS``, * The :command:`file(GENERATE)` command gained ``NO_SOURCE_PERMISSIONS``,
``USE_SOURCE_PERMISSIONS``, and ``FILE_PERMISSIONS`` options to support ``USE_SOURCE_PERMISSIONS``, and ``FILE_PERMISSIONS`` options for controlling
permissions of the generated file. the permissions of the generated file.
* The :command:`install(FILES)` command ``RENAME`` option learned to * The :command:`install(FILES)` command ``RENAME`` option learned to
support :manual:`generator expressions <cmake-generator-expressions(7)>`. support :manual:`generator expressions <cmake-generator-expressions(7)>`.
...@@ -171,14 +171,14 @@ Modules ...@@ -171,14 +171,14 @@ Modules
------- -------
* The :module:`ExternalData` module :command:`ExternalData_Add_Target` * The :module:`ExternalData` module :command:`ExternalData_Add_Target`
function gained a ``SHOW_PROGRESS <bool>`` option to suppress progress function gained a ``SHOW_PROGRESS <bool>`` option for controlling whether
output during the build. or not to show progress output during the build.
* The :module:`ExternalProject` module :command:`ExternalProject_Add` function * The :module:`ExternalProject` module :command:`ExternalProject_Add` function
gained a ``CONFIGURE_HANDLED_BY_BUILD`` option to have subsequent runs of gained a ``CONFIGURE_HANDLED_BY_BUILD`` option. This can be used to make
the configure step be triggered by the build step when an external project subsequent runs of the configure step be triggered by the build step when
dependency rebuilds instead of always rerunning the configure step when an external project dependency rebuilds instead of always re-running the
an external project dependency rebuilds. configure step in such cases.
* The :module:`FindBoost` module gained a ``Boost_NO_WARN_NEW_VERSIONS`` * The :module:`FindBoost` module gained a ``Boost_NO_WARN_NEW_VERSIONS``
option to silence the warning about unknown dependencies for new option to silence the warning about unknown dependencies for new
...@@ -234,7 +234,7 @@ CPack ...@@ -234,7 +234,7 @@ CPack
resolving private library dependencies when using resolving private library dependencies when using
``dpkg-shlibdeps``. ``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 :variable:`CPACK_IFW_PACKAGE_WIZARD_SHOW_PAGE_LIST` variable to
control visibility of the widget listing installer pages on the left side control visibility of the widget listing installer pages on the left side
of the wizard. This feature available only since QtIFW 4.0. of the wizard. This feature available only since QtIFW 4.0.
...@@ -244,9 +244,9 @@ CPack ...@@ -244,9 +244,9 @@ CPack
:variable:`CPACK_NSIS_BRANDING_TEXT_TRIM_POSITION` variables to change :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 text at the bottom of the install window and change its trim position
* The :cpack_gen:`CPack NSIS Generator` now handles correctly Unicode characters. * The :cpack_gen:`CPack NSIS Generator` now correctly handles Unicode
If you want to have a ``CPACK_RESOURCE_FILE_LICENSE`` with UTF-8 characters characters. If you want to have a :variable:`CPACK_RESOURCE_FILE_LICENSE`
it needs to be encoded in UTF-8 BOM. with UTF-8 characters, it needs to be encoded in UTF-8 BOM.
* The :cpack_gen:`CPack NuGet Generator` gained options: * The :cpack_gen:`CPack NuGet Generator` gained options:
...@@ -327,10 +327,12 @@ Other Changes ...@@ -327,10 +327,12 @@ Other Changes
phase when the required content is already populated and phase when the required content is already populated and
up-to-date. up-to-date.
* The precompiled Linux binaries provided on ``cmake.org`` have changed * The precompiled Linux binaries provided on
their naming pattern to ``cmake-$ver-linux-$arch``, where ``$arch`` `cmake.org <https://cmake.org/download/>`_ have changed their naming pattern
is either ``x86_64`` or ``aarch64``. to ``cmake-$ver-linux-$arch``, where ``$arch`` is either ``x86_64`` or
``aarch64``.
* The precompiled Windows binaries provided on ``cmake.org`` have changed * The precompiled Windows binaries provided on
their naming pattern to ``cmake-$ver-windows-$arch``, where ``$arch`` `cmake.org <https://cmake.org/download/>`_ have changed their naming pattern
is either ``x86_64`` or ``i386``. to ``cmake-$ver-windows-$arch``, where ``$arch`` is either ``x86_64`` or
``i386``.
...@@ -188,9 +188,11 @@ void cmCPackIFWInstaller::ConfigureFromOptions() ...@@ -188,9 +188,11 @@ void cmCPackIFWInstaller::ConfigureFromOptions()
} else { } else {
cmCPackIFWLogger( cmCPackIFWLogger(
WARNING, WARNING,
"Option CPACK_IFW_PACKAGE_WIZARD_SHOW_PAGE_LIST is set to value \"" "Option CPACK_IFW_PACKAGE_WIZARD_SHOW_PAGE_LIST is set to \""
<< option << "\". But has no any effect for QtIFW less than 4.0 " << option
<< "and will be skipped." << std::endl); << "\", 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() ...@@ -275,9 +277,8 @@ void cmCPackIFWInstaller::ConfigureFromOptions()
class cmCPackIFWResourcesParser : public cmXMLParser class cmCPackIFWResourcesParser : public cmXMLParser
{ {
public: public:
cmCPackIFWResourcesParser(cmCPackIFWInstaller* i) explicit cmCPackIFWResourcesParser(cmCPackIFWInstaller* i)
: installer(i) : installer(i)
, file(false)
{ {
this->path = i->Directory + "/resources"; this->path = i->Directory + "/resources";
} }
...@@ -296,7 +297,9 @@ public: ...@@ -296,7 +297,9 @@ public:
} }
cmCPackIFWInstaller* installer; cmCPackIFWInstaller* installer;
bool file, hasFiles, hasErrors; bool file = false;
bool hasFiles = false;
bool hasErrors = false;
std::string path, basePath; std::string path, basePath;
protected: protected:
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment