Merge topic 'renumber-to-4.0'

bd176b430c Renumber post-3.31 development from 3.32 to 4.0

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !10183
This commit is contained in:
Brad King 2025-01-17 13:56:05 +00:00 committed by Kitware Robot
commit 759b55991a
51 changed files with 69 additions and 70 deletions

View File

@ -1,7 +1,7 @@
Handling Compiler Driver Differences
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
.. versionadded:: 3.32
.. versionadded:: 4.0
To pass options to the linker tool, each compiler driver has its own syntax.
The ``LINKER:`` prefix and ``,`` separator can be used to specify, in a portable

View File

@ -1,7 +1,7 @@
cmake_instrumentation
---------------------
.. versionadded:: 3.32
.. versionadded:: 4.0
Enables interacting with the
:manual:`CMake Instrumentation API <cmake-instrumentation(7)>`.

View File

@ -185,12 +185,12 @@ Options:
``NONE``
.. versionadded:: 3.32
.. versionadded:: 4.0
Regardless of any of the commands failing, the ``execute_process()``
command will not halt with an error.
.. versionadded:: 3.32
.. versionadded:: 4.0
If not provided, the
:variable:`CMAKE_EXECUTE_PROCESS_COMMAND_ERROR_IS_FATAL` variable

View File

@ -373,7 +373,7 @@ Each entry is meant for installation trees following Windows (``W``), UNIX
.. [#p1] .. versionadded:: 3.25
.. [#p2] .. versionadded:: 3.32
.. [#p2] .. versionadded:: 4.0
On systems supporting macOS :prop_tgt:`FRAMEWORK` and :prop_tgt:`BUNDLE`, the
following directories are searched for Frameworks or Application Bundles
@ -393,7 +393,7 @@ containing a configuration file:
``<prefix>/<name>.app/Contents/Resources/CMake/`` A
=============================================================== ==========
.. [#p3] .. versionadded:: 3.32
.. [#p3] .. versionadded:: 4.0
When searching the above paths, ``find_package`` will only look for ``.cps``
files in search paths which contain ``/cps/``, and will only look for
@ -611,7 +611,7 @@ before calling ``find_package``.
Added the ``CMAKE_FIND_USE_<CATEGORY>`` variables to globally disable
various search locations.
.. versionchanged:: 3.32
.. versionchanged:: 4.0
The variables :variable:`CMAKE_FIND_PACKAGE_SORT_ORDER` and
:variable:`CMAKE_FIND_PACKAGE_SORT_DIRECTION` now also control the order
in which ``find_package`` searches directories matching the glob expression

View File

@ -351,7 +351,7 @@ as needed to honor the state of the calling project:
* :policy:`CMP0157`
* :policy:`CMP0181`
.. versionadded:: 3.32
.. versionadded:: 4.0
The current setting of :policy:`CMP0181` policy is propagated through to the
generated test project.

View File

@ -121,7 +121,7 @@
.. option:: --project-file <project-file-name>
.. versionadded:: 3.32
.. versionadded:: 4.0
Specify an alternate project file name.

View File

@ -797,7 +797,7 @@ in cmake-style format.
.. genex:: $<PATH:NATIVE_PATH[,NORMALIZE],path...>
.. versionadded:: 3.32
.. versionadded:: 4.0
Returns ``path`` converted into a native format with platform-specific
slashes (``\`` on Windows hosts and ``/`` elsewhere).

View File

@ -3,7 +3,7 @@
cmake-instrumentation(7)
************************
.. versionadded:: 3.32
.. versionadded:: 4.0
.. only:: html

View File

@ -51,8 +51,8 @@ The :variable:`CMAKE_MINIMUM_REQUIRED_VERSION` variable may also be used
to determine whether to report an error on use of deprecated macros or
functions.
Policies Introduced by CMake 3.32
=================================
Policies Introduced by CMake 4.0
================================
.. toctree::
:maxdepth: 1

View File

@ -515,7 +515,7 @@ Options
.. option:: --link-no-warning-as-error
.. versionadded:: 3.32
.. versionadded:: 4.0
Ignore target property :prop_tgt:`LINK_WARNING_AS_ERROR` and variable
:variable:`CMAKE_LINK_WARNING_AS_ERROR`, preventing warnings from being

View File

@ -367,7 +367,7 @@ Run Tests
use interactive mode, and follow the Windows documentation
on `Collecting User-Mode Dumps`_.
.. versionchanged:: 3.32
.. versionchanged:: 4.0
Windows Error Reporting (WER) is enabled in interactive mode, so
test processes may show debug popup windows and create core dumps.
This was made possible by updates to ``libuv``.

View File

@ -1,7 +1,7 @@
CMP0181
-------
.. versionadded:: 3.32
.. versionadded:: 4.0
The :variable:`CMAKE_EXE_LINKER_FLAGS`,
:variable:`CMAKE_EXE_LINKER_FLAGS_<CONFIG>`,
@ -13,7 +13,7 @@ re-quoted and support the ``LINKER:`` prefix.
CMake 3.31 and below use the content of these variables as is.
CMake 3.32 and above parse the content of these variables and manage the
CMake 4.0 and above parse the content of these variables and manage the
escaping of special characters. Moreover, the ``LINKER:`` prefix is now
recognized and expanded.
@ -34,7 +34,7 @@ The ``NEW`` behavior of this policy is to parse and re-quote the content of the
and :variable:`CMAKE_MODULE_LINKER_FLAGS_<CONFIG>` variables as well as to
expand the ``LINKER:`` prefix.
.. |INTRODUCED_IN_CMAKE_VERSION| replace:: 3.32
.. |INTRODUCED_IN_CMAKE_VERSION| replace:: 4.0
.. |WARNS_OR_DOES_NOT_WARN| replace:: does *not* warn
.. include:: STANDARD_ADVICE.txt

View File

@ -1,7 +1,7 @@
CMP0182
-------
.. versionadded:: 3.32
.. versionadded:: 4.0
Create shared library archives by default on AIX.
@ -14,7 +14,7 @@ file is placed inside an archive ``.a`` file. However, the behavior
was disabled by default for compatibility with existing projects that
do not set :prop_tgt:`AIX_SHARED_LIBRARY_ARCHIVE`.
CMake 3.32 and above prefer, when :prop_tgt:`AIX_SHARED_LIBRARY_ARCHIVE`
CMake 4.0 and above prefer, when :prop_tgt:`AIX_SHARED_LIBRARY_ARCHIVE`
is not set, to enable creation of shared library archives by default
because it is the preferred convention on AIX. This policy provides
compatibility for projects that have not been updated.
@ -24,7 +24,7 @@ archives when :prop_tgt:`AIX_SHARED_LIBRARY_ARCHIVE` is not set.
The ``NEW`` behavior for this policy is to enable shared library
archives when :prop_tgt:`AIX_SHARED_LIBRARY_ARCHIVE` is not set.
.. |INTRODUCED_IN_CMAKE_VERSION| replace:: 3.32
.. |INTRODUCED_IN_CMAKE_VERSION| replace:: 4.0
.. |WARNS_OR_DOES_NOT_WARN| replace:: does *not* warn
.. include:: STANDARD_ADVICE.txt

View File

@ -1,14 +1,14 @@
CMP0183
-------
.. versionadded:: 3.32
.. versionadded:: 4.0
:command:`add_feature_info` supports full :ref:`Condition Syntax`.
The ``<enabled>`` parameter accepts a :ref:`semicolon-separated list <CMake
Language Lists>` of conditions. CMake 3.31 and lower evaluate each
``condition`` as ``if(${condition})``, which does not properly handle
conditions with nested paren groups. CMake 3.32 and above instead prefer
conditions with nested paren groups. CMake 4.0 and above instead prefer
to evaluate each ``condition`` as ``if(<condition>)``, where ``<condition>``
is re-parsed as if literally written in a call to :command:`if`. This
allows expressions like::
@ -26,7 +26,7 @@ to be re-written as::
Policy ``CMP0183`` provides compatibility for projects that have not
been updated to expect the new behavior.
.. |INTRODUCED_IN_CMAKE_VERSION| replace:: 3.32
.. |INTRODUCED_IN_CMAKE_VERSION| replace:: 4.0
.. |WARNS_OR_DOES_NOT_WARN| replace:: warns
.. include:: STANDARD_ADVICE.txt

View File

@ -1,7 +1,7 @@
VS_SOLUTION_ITEMS
-----------------
.. versionadded:: 3.32
.. versionadded:: 4.0
Specify solution level items included in the generated Visual Studio solution.

View File

@ -1,7 +1,7 @@
VS_CUSTOM_COMMAND_DISABLE_PARALLEL_BUILD
----------------------------------------
.. versionadded:: 3.32
.. versionadded:: 4.0
A boolean property that disables parallel building for the source file in
Visual Studio if it is built via :command:`add_custom_command` and is the

View File

@ -22,7 +22,7 @@ is created by :command:`add_library`. Imported targets must explicitly
enable :prop_tgt:`!AIX_SHARED_LIBRARY_ARCHIVE` if they import an AIX
shared library archive.
.. versionchanged:: 3.32
.. versionchanged:: 4.0
For a non-imported target, if this property is not set, the
default is *enabled*. See policy :policy:`CMP0182`.

View File

@ -1,7 +1,7 @@
DEBUGGER_WORKING_DIRECTORY
--------------------------
.. versionadded:: 3.32
.. versionadded:: 4.0
Sets the local debugger working directory for C++ targets.
The property value may use

View File

@ -1,7 +1,7 @@
Fortran_BUILDING_INSTRINSIC_MODULES
-----------------------------------
.. deprecated:: 3.32
.. deprecated:: 4.0
Please use the :prop_tgt:`Fortran_BUILDING_INTRINSIC_MODULES` instead.

View File

@ -1,7 +1,7 @@
Fortran_BUILDING_INTRINSIC_MODULES
----------------------------------
.. versionadded:: 3.32
.. versionadded:: 4.0
Instructs the CMake Fortran preprocessor that the target is building
Fortran intrinsics for building a Fortran compiler.

View File

@ -1,7 +1,7 @@
LINK_WARNING_AS_ERROR
---------------------
.. versionadded:: 3.32
.. versionadded:: 4.0
Specify whether to treat warnings on link as errors.
If enabled, adds a flag to treat warnings on link as errors.

View File

@ -1,7 +1,7 @@
Handling Archiver Driver Differences
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
.. versionadded:: 3.32
.. versionadded:: 4.0
To pass options to the archiver tool, each compiler driver has its own syntax.
The ``ARCHIVER:`` prefix and ``,`` separator can be used to specify, in a portable

View File

@ -11,7 +11,7 @@ placed in the build directory corresponding to the target's source directory.
If the variable :variable:`CMAKE_Swift_MODULE_DIRECTORY` is set when a target is
created its value is used to initialize this property.
.. versionadded:: 3.32
.. versionadded:: 4.0
The property value may use
:manual:`generator expressions <cmake-generator-expressions(7)>`.

View File

@ -1,7 +1,7 @@
UNITY_BUILD_RELOCATABLE
-----------------------
.. versionadded:: 3.32
.. versionadded:: 4.0
By default, the unity file generated when :prop_tgt:`UNITY_BUILD` is enabled
uses absolute paths to reference the original source files. This causes the

View File

@ -1,7 +1,7 @@
XCODE_SCHEME_LLDB_INIT_FILE
---------------------------
.. versionadded:: 3.32
.. versionadded:: 4.0
Property value for ``LLDB Init File`` in the Info section of the
generated Xcode scheme. In case the value contains generator

View File

@ -1,7 +1,7 @@
XCODE_SCHEME_TEST_CONFIGURATION
-------------------------------
.. versionadded:: 3.32
.. versionadded:: 4.0
Set the build configuration to test the target.

View File

@ -1,7 +1,7 @@
CMAKE_DEBUGGER_WORKING_DIRECTORY
--------------------------------
.. versionadded:: 3.32
.. versionadded:: 4.0
This variable is used to initialize the :prop_tgt:`DEBUGGER_WORKING_DIRECTORY`
property on each target as it is created. See that target property

View File

@ -1,7 +1,7 @@
CMAKE_EXECUTE_PROCESS_COMMAND_ERROR_IS_FATAL
--------------------------------------------
.. versionadded:: 3.32
.. versionadded:: 4.0
Specify a default for the :command:`execute_process` command's
``COMMAND_ERROR_IS_FATAL`` option. This variable is ignored when a

View File

@ -1,7 +1,7 @@
CMAKE_<LANG>_ARCHIVER_WRAPPER_FLAG
----------------------------------
.. versionadded:: 3.32
.. versionadded:: 4.0
Defines the syntax of compiler driver option to pass options to the archiver
tool. It will be used to translate the ``ARCHIVER:`` prefix in the static

View File

@ -1,7 +1,7 @@
CMAKE_<LANG>_ARCHIVER_WRAPPER_FLAG_SEP
--------------------------------------
.. versionadded:: 3.32
.. versionadded:: 4.0
This variable is used with :variable:`CMAKE_<LANG>_ARCHIVER_WRAPPER_FLAG`
variable to format ``ARCHIVER:`` prefix in the static library options

View File

@ -1,7 +1,7 @@
CMAKE_<LANG>_LINK_MODE
----------------------
.. versionadded:: 3.32
.. versionadded:: 4.0
Defines how the link step is done. The possible values are:

View File

@ -1,7 +1,7 @@
CMAKE_LINK_WARNING_AS_ERROR
---------------------------
.. versionadded:: 3.32
.. versionadded:: 4.0
Specify whether to treat warnings on link as errors.

View File

@ -1,7 +1,7 @@
CMAKE_LIST_FILE_NAME
--------------------
.. versionadded:: 3.32
.. versionadded:: 4.0
The name of the CMake project files. This determines the top-level file
processed when CMake is configured, and the file processed by

View File

@ -1,7 +1,7 @@
CMAKE_XCODE_SCHEME_LLDB_INIT_FILE
---------------------------------
.. versionadded:: 3.32
.. versionadded:: 4.0
Property value for ``LLDB Init File`` in the Info section of the generated Xcode
scheme.

View File

@ -1,7 +1,7 @@
CMAKE_XCODE_SCHEME_TEST_CONFIGURATION
-------------------------------------
.. versionadded:: 3.32
.. versionadded:: 4.0
Set the build configuration to test the target.

View File

@ -750,7 +750,7 @@ step. This can be overridden with custom install commands if required.
has additional documentation.
``INSTALL_JOB_SERVER_AWARE <bool>``
.. versionadded:: 3.32
.. versionadded:: 4.0
Specifies that the install step is aware of the GNU Make job server.
See the :command:`add_custom_command` documentation of its

View File

@ -668,7 +668,7 @@ endfunction()
.. versionchanged:: 3.8
``<enabled>`` can be a list of conditions.
.. versionchanged:: 3.32
.. versionchanged:: 4.0
Full :ref:`Condition Syntax` is now supported for ``<enabled>``.
See policy :policy:`CMP0183`.

View File

@ -47,13 +47,13 @@ the token list.
The options are:
``OPTIONS <options>...``
.. versionadded:: 3.32
.. versionadded:: 4.0
A :ref:`semicolon-separated list <CMake Language Lists>` of options added to
the ``bison`` command line.
``COMPILE_FLAGS <string>``
.. deprecated:: 3.32
.. deprecated:: 4.0
Space-separated bison options added to the ``bison`` command line.
A :ref:`;-list <CMake Language Lists>` will not work.
@ -96,12 +96,12 @@ The macro defines the following variables:
report.
``BISON_<Name>_OPTIONS``
.. versionadded:: 3.32
.. versionadded:: 4.0
Options used in the ``bison`` command line.
``BISON_<Name>_COMPILE_FLAGS``
.. deprecated:: 3.32
.. deprecated:: 4.0
Options used in the ``bison`` command line. This variable is deprecated in
favor of ``BISON_<Name>_OPTIONS`` variable.

View File

@ -47,13 +47,13 @@ custom command.
The options are:
``OPTIONS <options>...``
.. versionadded:: 3.32
.. versionadded:: 4.0
A :ref:`semicolon-separated list <CMake Language Lists>` of flex options added
to the ``flex`` command line.
``COMPILE_FLAGS <string>``
.. deprecated:: 3.32
.. deprecated:: 4.0
Space-separated flex options added to the ``flex`` command line.
A :ref:`;-list <CMake Language Lists>` will not work.
@ -84,7 +84,7 @@ The macro defines the following variables:
The header flex output, if any.
``FLEX_<Name>_OPTIONS``
.. versionadded:: 3.32
.. versionadded:: 4.0
Options used in the ``flex`` command line.

View File

@ -7,7 +7,7 @@ FindGDAL
Find Geospatial Data Abstraction Library (GDAL).
.. deprecated:: 3.32
.. deprecated:: 4.0
GDAL 3.5 and above provide a ``GDALConfig.cmake`` package configuration file.
Call ``find_package(GDAL CONFIG)`` to find it directly and avoid using this
find module. For further details, see `GDAL's documentation on CMake

View File

@ -19,7 +19,7 @@ The following :prop_tgt:`IMPORTED` targets are also defined:
``Patch::patch``
The command-line executable.
.. versionchanged:: 3.32
.. versionchanged:: 4.0
Imported target is defined only when :prop_gbl:`CMAKE_ROLE` is ``PROJECT``.
Example usage:

View File

@ -225,7 +225,7 @@ Example:
Additional arguments that are forwarded to protoc.
``PROTOC_EXE <executable>``
.. versionadded:: 3.32
.. versionadded:: 4.0
Command name, path, or CMake executable used to generate protobuf bindings.
If omitted, ``protobuf::protoc`` is used.

View File

@ -560,7 +560,7 @@ can be controlled with the following variable:
requirements.
``Python_ARTIFACTS_PREFIX``
.. versionadded:: 3.32
.. versionadded:: 4.0
Define a custom prefix which will be used for the definition of all the
result variables, targets, and commands. By using this variable, this module

View File

@ -441,7 +441,7 @@ can be controlled with the following variable:
requirements.
``Python2_ARTIFACTS_PREFIX``
.. versionadded:: 3.32
.. versionadded:: 4.0
Define a custom prefix which will be used for the definition of all the
result variables, targets, and commands. By using this variable, this module

View File

@ -558,7 +558,7 @@ can be controlled with the following variable:
requirements.
``Python3_ARTIFACTS_PREFIX``
.. versionadded:: 3.32
.. versionadded:: 4.0
Define a custom prefix which will be used for the definition of all the
result variables, targets, and commands. By using this variable, this module

View File

@ -166,7 +166,7 @@ bool cmDependsFortran::Finalize(std::ostream& makeDepends,
mod_dir = this->LocalGenerator->GetCurrentBinaryDirectory();
}
// ATTENTION Before 3.32 the property name was misspelled.
// ATTENTION Before 4.0 the property name was misspelled.
// Check the correct name first and than the old name.
bool building_intrinsics =
!mf->GetSafeDefinition("CMAKE_Fortran_TARGET_BUILDING_INTRINSIC_MODULES")

View File

@ -4046,7 +4046,7 @@ std::string cmGeneratorTarget::GetFortranModuleDirectory(
bool cmGeneratorTarget::IsFortranBuildingIntrinsicModules() const
{
// ATTENTION Before 3.32 the property name was misspelled.
// ATTENTION Before 4.0 the property name was misspelled.
// Check the correct name first and than the old name.
if (cmValue prop = this->GetProperty("Fortran_BUILDING_INTRINSIC_MODULES")) {
return prop.IsOn();

View File

@ -547,13 +547,12 @@ class cmMakefile;
"project() always sets <PROJECT-NAME>_* as normal variables.", 3, \
31, 0, WARN) \
SELECT(POLICY, CMP0181, \
"Link command-line fragment variables are parsed and re-quoted.", 3, \
32, 0, WARN) \
"Link command-line fragment variables are parsed and re-quoted.", 4, \
0, 0, WARN) \
SELECT(POLICY, CMP0182, \
"Create shared library archives by default on AIX.", 3, 32, 0, WARN) \
"Create shared library archives by default on AIX.", 4, 0, 0, WARN) \
SELECT(POLICY, CMP0183, \
"add_feature_info() supports full Condition Syntax.", 3, 32, 0, \
WARN)
"add_feature_info() supports full Condition Syntax.", 4, 0, 0, WARN)
#define CM_SELECT_ID(F, A1, A2, A3, A4, A5, A6) F(A1)
#define CM_FOR_EACH_POLICY_ID(POLICY) \

View File

@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.31...3.32)
cmake_minimum_required(VERSION 3.31...4.0)
project(${RunCMake_TEST} LANGUAGES NONE)

View File

@ -1,3 +1,3 @@
cmake_minimum_required(VERSION 3.31...3.32)
cmake_minimum_required(VERSION 3.31...4.0)
project(${RunCMake_TEST} NONE)
include(${RunCMake_TEST}.cmake)

View File

@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.30...3.32)
cmake_minimum_required(VERSION 3.30...4.0)
project(${RunCMake_TEST} LANGUAGES NONE)