From 730cad9cb6c0531bc02aa1d6b719a24a005d8ee5 Mon Sep 17 00:00:00 2001 From: Craig Scott Date: Fri, 14 Nov 2025 14:22:21 +1100 Subject: [PATCH] Help: Fix typos and formatting for 4.2 release --- Help/command/string.rst | 2 +- Help/prop_sf/INSTALL_OBJECT_NAME.rst | 7 ++++--- Help/prop_sf/OBJECT_NAME.rst | 9 +++++---- Modules/ExternalProject.cmake | 2 +- 4 files changed, 11 insertions(+), 9 deletions(-) diff --git a/Help/command/string.rst b/Help/command/string.rst index 24351445fd..b58c33ee46 100644 --- a/Help/command/string.rst +++ b/Help/command/string.rst @@ -297,7 +297,7 @@ Manipulation .. versionadded:: 4.2 Store in an ```` a regular expression matching the ````. - All characters that have special meaning in a regular expressions are + All characters that have special meaning in a regular expression are escaped, such that the output string can be used as part of a regular expression to match the input literally. diff --git a/Help/prop_sf/INSTALL_OBJECT_NAME.rst b/Help/prop_sf/INSTALL_OBJECT_NAME.rst index d99ebb49b8..34d1b6adef 100644 --- a/Help/prop_sf/INSTALL_OBJECT_NAME.rst +++ b/Help/prop_sf/INSTALL_OBJECT_NAME.rst @@ -8,8 +8,8 @@ file. An empty string value disables custom object naming. The value must be a relative path, and may not include special directory components (e.g., ``..``). -Note that the object name may not be used as-is in -:prop_tgt:`INSTALL_OBJECT_NAME_STRATEGY` strategies, but instead changed as +Note that the object name might not be used as-is in some +:prop_tgt:`INSTALL_OBJECT_NAME_STRATEGY` strategies. It may be changed as the strategy requires to fulfill its goals. This property supports @@ -20,6 +20,7 @@ This property supports this property, collisions must be avoided in the project code. CMake has a number of source files it generates that also create object files that may collide with a given custom name. These include: + * Generated PCH source files (``cmake_pch``) - * Generated Unity compilation files (``unity_``) + * Generated Unity compilation files (``unity_...``) * Qt autogen sources (``moc_compilations.cpp``) diff --git a/Help/prop_sf/OBJECT_NAME.rst b/Help/prop_sf/OBJECT_NAME.rst index 35ae985ac5..173e5ba8cf 100644 --- a/Help/prop_sf/OBJECT_NAME.rst +++ b/Help/prop_sf/OBJECT_NAME.rst @@ -7,9 +7,9 @@ Set the object name (without the object extension) of the source file. An empty string value disables custom object naming. The value must be a relative path, and may not include special directory components (e.g., ``..``). -Note that the object name may not be used as-is in +Note that the object name might not be used as-is in :variable:`CMAKE_INTERMEDIATE_DIR_STRATEGY` and -:prop_tgt:`INSTALL_OBJECT_NAME_STRATEGY` strategies, but instead changed as +:prop_tgt:`INSTALL_OBJECT_NAME_STRATEGY` strategies. It may be changed as the strategy requires to fulfill its goals. When installing objects, the :prop_sf:`INSTALL_OBJECT_NAME` property takes @@ -24,10 +24,11 @@ allow for context-sensitive (i.e., configuration-dependent) expressions. this property, collisions must be avoided in the project code. CMake has a number of source files it generates that also create object files that may collide with a given custom name. These include: + * Generated PCH source files (``cmake_pch``) - * Generated Unity compilation files (``unity_``) + * Generated Unity compilation files (``unity_...``) * Qt autogen sources (``moc_compilations.cpp``) .. note:: The :generator:`FASTBuild` and :generator:`Xcode` generators do not support - this property and it is ignored. + this property and will ignore it. diff --git a/Modules/ExternalProject.cmake b/Modules/ExternalProject.cmake index ee10ffa006..bae238de9d 100644 --- a/Modules/ExternalProject.cmake +++ b/Modules/ExternalProject.cmake @@ -686,7 +686,7 @@ overridden if required. ) This snippet defines two environment variables when configuring the example - project. The ``SDKROOT`` environment variable is set to ``macosx`, while + project. The ``SDKROOT`` environment variable is set to ``macosx``, while the value of ``PKG_CONFIG_PATH`` is forwarded to the external project. Environment modifications work with ``LIST_SEPARATOR`` to replace the