diff options
Diffstat (limited to 'Help')
| -rw-r--r-- | Help/command/find_package.rst | 14 | ||||
| -rw-r--r-- | Help/guide/using-dependencies/index.rst | 2 | ||||
| -rw-r--r-- | Help/manual/cmake-generator-expressions.7.rst | 2 | ||||
| -rw-r--r-- | Help/policy/CMP0097.rst | 6 | ||||
| -rw-r--r-- | Help/prop_tgt/VERIFY_INTERFACE_HEADER_SETS.rst | 14 | ||||
| -rw-r--r-- | Help/release/3.24.rst | 4 |
6 files changed, 29 insertions, 13 deletions
diff --git a/Help/command/find_package.rst b/Help/command/find_package.rst index 35e3c51..ee52c41 100644 --- a/Help/command/find_package.rst +++ b/Help/command/find_package.rst @@ -103,8 +103,9 @@ Basic Signature [REQUIRED] [[COMPONENTS] [components...]] [OPTIONAL_COMPONENTS components...] [REGISTRY_VIEW (64|32|64_32|32_64|HOST|TARGET|BOTH)] + [GLOBAL] [NO_POLICY_SCOPE] - [GLOBAL]) + [BYPASS_PROVIDER]) The basic signature is supported by both Module and Config modes. The ``MODULE`` keyword implies that only Module mode can be used to find @@ -181,6 +182,14 @@ only take the single version at the lower end of the range into account. See the :command:`cmake_policy` command documentation for discussion of the ``NO_POLICY_SCOPE`` option. +.. versionadded:: 3.24 + The ``BYPASS_PROVIDER`` keyword is only allowed when ``find_package()`` is + being called by a :ref:`dependency provider <dependency_providers>`. + It can be used by providers to call the built-in ``find_package()`` + implementation directly and prevent that call from being re-routed back to + itself. Future versions of CMake may detect attempts to use this keyword + from places other than a dependency provider and halt with a fatal error. + .. _`full signature`: Full Signature @@ -192,8 +201,9 @@ Full Signature [REQUIRED] [[COMPONENTS] [components...]] [OPTIONAL_COMPONENTS components...] [CONFIG|NO_MODULE] - [NO_POLICY_SCOPE] [GLOBAL] + [NO_POLICY_SCOPE] + [BYPASS_PROVIDER] [NAMES name1 [name2 ...]] [CONFIGS config1 [config2 ...]] [HINTS path1 [path2 ... ]] diff --git a/Help/guide/using-dependencies/index.rst b/Help/guide/using-dependencies/index.rst index 6cab7ef..bb519ad 100644 --- a/Help/guide/using-dependencies/index.rst +++ b/Help/guide/using-dependencies/index.rst @@ -388,7 +388,7 @@ can still be built out-of-the-box. The developer, on the other hand, may be much more interested in controlling *how* a dependency is provided to the project. You might want to use a -particular version of a package that you built themself. You might want +particular version of a package that you built yourself. You might want to use a third party package manager. You might want to redirect some requests to a different URL on a system you control for security or performance reasons. CMake supports these sort of scenarios through diff --git a/Help/manual/cmake-generator-expressions.7.rst b/Help/manual/cmake-generator-expressions.7.rst index 9949772..7a6188a 100644 --- a/Help/manual/cmake-generator-expressions.7.rst +++ b/Help/manual/cmake-generator-expressions.7.rst @@ -521,7 +521,7 @@ in cmake-style format. See :ref:`cmake_path(REMOVE_EXTENSION) <REMOVE_EXTENSION>` for more details. -.. genex:: $<PATH:REPLACE_EXTENSION[,LAST_ONLY],path> +.. genex:: $<PATH:REPLACE_EXTENSION[,LAST_ONLY],path,input> .. versionadded:: 3.24 diff --git a/Help/policy/CMP0097.rst b/Help/policy/CMP0097.rst index 2240874..24957d0 100644 --- a/Help/policy/CMP0097.rst +++ b/Help/policy/CMP0097.rst @@ -4,9 +4,11 @@ CMP0097 .. versionadded:: 3.16 :command:`ExternalProject_Add` with ``GIT_SUBMODULES ""`` initializes no -submodules. +submodules. The policy also applies to :command:`FetchContent_Declare`, +which uses the same download and update features as +:command:`ExternalProject_Add`. -The module provides a ``GIT_SUBMODULES`` option which controls what submodules +The commands provide a ``GIT_SUBMODULES`` option which controls what submodules to initialize and update. Starting with CMake 3.16, explicitly setting ``GIT_SUBMODULES`` to an empty string means no submodules will be initialized or updated. diff --git a/Help/prop_tgt/VERIFY_INTERFACE_HEADER_SETS.rst b/Help/prop_tgt/VERIFY_INTERFACE_HEADER_SETS.rst index 30c02f5..1cf4a69 100644 --- a/Help/prop_tgt/VERIFY_INTERFACE_HEADER_SETS.rst +++ b/Help/prop_tgt/VERIFY_INTERFACE_HEADER_SETS.rst @@ -7,13 +7,13 @@ Used to verify that all headers in a target's ``PUBLIC`` and ``INTERFACE`` header sets can be included on their own. When this property is set to true, and the target is an object library, static -library, shared library, or executable with exports enabled, and the target -has one or more ``PUBLIC`` or ``INTERFACE`` header sets, an object library -target named ``<target_name>_verify_interface_header_sets`` is created. This -verification target has one source file per header in the ``PUBLIC`` and -``INTERFACE`` header sets. Each source file only includes its associated -header file. The verification target links against the original target to get -all of its usage requirements. The verification target has its +library, shared library, interface library, or executable with exports enabled, +and the target has one or more ``PUBLIC`` or ``INTERFACE`` header sets, an +object library target named ``<target_name>_verify_interface_header_sets`` is +created. This verification target has one source file per header in the +``PUBLIC`` and ``INTERFACE`` header sets. Each source file only includes its +associated header file. The verification target links against the original +target to get all of its usage requirements. The verification target has its :prop_tgt:`EXCLUDE_FROM_ALL` and :prop_tgt:`DISABLE_PRECOMPILE_HEADERS` properties set to true, and its :prop_tgt:`AUTOMOC`, :prop_tgt:`AUTORCC`, :prop_tgt:`AUTOUIC`, and :prop_tgt:`UNITY_BUILD` properties set to false. diff --git a/Help/release/3.24.rst b/Help/release/3.24.rst index f9e66b6..02252e0 100644 --- a/Help/release/3.24.rst +++ b/Help/release/3.24.rst @@ -220,6 +220,10 @@ Modules gained a ``NO_IMPLICIT_LINK_TO_MATLAB_LIBRARIES`` option to disable automatic linking of MATLAB libraries. +* The :module:`FindVulkan` module now supports components to select which + VulkanSDK tool and libraries to find in addition to the Vulkan SDK headers + and library. + * The :module:`FindZLIB` gained a new ``ZLIB_USE_STATIC_LIBS`` variable to search only for static libraries. |