From 31fb693d06009abbb48c4f2a55ee8bb3278dbaee Mon Sep 17 00:00:00 2001 From: Craig Scott Date: Sat, 16 Mar 2024 16:27:04 +1100 Subject: Help: Fix typos and grammar in pre-3.29 docs --- Help/manual/cmake-configure-log.7.rst | 2 +- Modules/CSharpUtilities.cmake | 2 +- Modules/Internal/CPack/CPackRPM.cmake | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Help/manual/cmake-configure-log.7.rst b/Help/manual/cmake-configure-log.7.rst index 4d64506..cb6cb90 100644 --- a/Help/manual/cmake-configure-log.7.rst +++ b/Help/manual/cmake-configure-log.7.rst @@ -56,7 +56,7 @@ step finished normally, ends with a ``...`` document marker line: A new document is appended to the log every time CMake configures the build tree and logs new events. -The keys of the each document root mapping are: +The keys of each document root mapping are: ``events`` A YAML block sequence of nodes corresponding to events logged during diff --git a/Modules/CSharpUtilities.cmake b/Modules/CSharpUtilities.cmake index b5520ef..cd44169 100644 --- a/Modules/CSharpUtilities.cmake +++ b/Modules/CSharpUtilities.cmake @@ -133,7 +133,7 @@ Helper functions which are used by the above ones Name of the variable in which the list of keys is stored ```` - filename(s) as given to to CSharp target using :command:`add_library` + filename(s) as given to CSharp target using :command:`add_library` or :command:`add_executable` In some way the function applies a canonicalization to the source names. diff --git a/Modules/Internal/CPack/CPackRPM.cmake b/Modules/Internal/CPack/CPackRPM.cmake index 5766045..23fb823 100644 --- a/Modules/Internal/CPack/CPackRPM.cmake +++ b/Modules/Internal/CPack/CPackRPM.cmake @@ -861,7 +861,7 @@ function(cpack_rpm_generate_package) # If rpmbuild is found # we try to discover alien since we may be on non RPM distro like Debian. - # In this case we may try to to use more advanced features + # In this case we may try to use more advanced features # like generating RPM directly from DEB using alien. # FIXME feature not finished (yet) find_program(ALIEN_EXECUTABLE alien) -- cgit v0.12 From eceb368ccc1f2f8f33b852bf0099f680416696ef Mon Sep 17 00:00:00 2001 From: Craig Scott Date: Fri, 15 Mar 2024 14:15:34 +1100 Subject: Help: Fix typos in 3.29 docs --- Help/command/if.rst | 2 +- Help/policy/CMP0156.rst | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Help/command/if.rst b/Help/command/if.rst index a4ccd97..de25ad3 100644 --- a/Help/command/if.rst +++ b/Help/command/if.rst @@ -180,7 +180,7 @@ File Operations .. note:: Prefer ``if(IS_READABLE)`` to check file readability. ``if(EXISTS)`` - may be changed in the future to to only check file existence. + may be changed in the future to only check file existence. .. signature:: if(IS_READABLE ) diff --git a/Help/policy/CMP0156.rst b/Help/policy/CMP0156.rst index 6fa0f04..d2ce291 100644 --- a/Help/policy/CMP0156.rst +++ b/Help/policy/CMP0156.rst @@ -17,20 +17,20 @@ Handling mutually dependent archives may be awkward when using a traditional linker. Archive files may have to be specified multiple times. Some linkers (for instance Apple or Windows linkers, as well as ``LLVM LLD``) -records all symbols found in objects and archives as it iterates over command +record all symbols found in objects and archives as they iterate over command line arguments. When one of these linkers encounters an undefined symbol that can be resolved by an object file contained in a previously processed archive file, it immediately extracts and links it into the output object. CMake 3.28 and below may generate link lines that repeat static libraries as -a traditional linker would need, even when using a linker does not need it. +a traditional linker would need, even when using a linker that does not need it. They may also de-duplicate shared libraries by keeping their last occurrence, which on Windows platforms can change DLL load order. CMake 3.29 and above prefer to apply different strategies based on linker capabilities. So, when targeting Apple and Windows platforms, all libraries are de-duplicated. Moreover, on Windows platforms, libraries -are de-duplicated by keeping their fist occurrence, thus respecting the +are de-duplicated by keeping their first occurrence, thus respecting the project-specified order. This policy provides compatibility with projects that have not been updated to expect the latter behavior. -- cgit v0.12