Skip to content

Commit 6bf32b7

Browse files
bradkingkwrobot
authored andcommitted
Merge topic 'doc-cleanup' into release-3.30
6636b11 Help: Minor grammar and formatting cleanup c2390f7 Help: Fix nuget example with unwanted comment and bad use of rst link Acked-by: Kitware Robot <[email protected]> Merge-request: !9600
2 parents 224e7b9 + 6636b11 commit 6bf32b7

File tree

3 files changed

+6
-7
lines changed

3 files changed

+6
-7
lines changed

Help/cpack_gen/nuget.rst

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -300,7 +300,7 @@ Example usage
300300
set(CPACK_GENERATOR NuGet)
301301
# Set up package metadata
302302
set(CPACK_PACKAGE_NAME SamplePackage)
303-
set(CPACK_PACKAGE_VERSION "1.0.0") # Why doesn't this pick up the version from the project?
303+
set(CPACK_PACKAGE_VERSION "1.0.0")
304304
set(CPACK_PACKAGE_VENDOR "Example Inc")
305305
set(CPACK_NUGET_PACKAGE_OWNERS "Example Inc")
306306
set(CPACK_PACKAGE_DESCRIPTION "A .NET wrapper around the foobar library for frobbling bratchens")
@@ -319,12 +319,11 @@ Example usage
319319
set(CPACK_NUGET_PACKAGE_DEPENDENCIES "Baz")
320320
set(CPACK_NUGET_PACKAGE_DEPENDENCIES_Baz_VERSION "9.8.6")
321321
# NB: Since "net6.0" was listed but no dependencies have been specified, an empty group
322-
# will be added to the nuspec file for this framework. This can be used to address `NU5128`_.
322+
# will be added to the nuspec file for this framework. This can be used to address warning NU5128.
323323
324324
include(CPack)
325325
326326
327-
328327
.. _nuget.org: https://www.nuget.org
329328
.. _version specification: https://learn.microsoft.com/en-us/nuget/concepts/package-versioning#version-ranges
330329
.. _SPDX license identifier: https://spdx.org/licenses

Help/policy/CMP0164.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ CMP0164
77
the platform.
88

99
In CMake 3.29 and below, on platforms that do not support shared libraries
10-
(:prop_gbl:`TARGET_SUPPORTS_SHARED_LIBS` is ``false``), the
11-
:command:`add_library` command automatically converted ``SHARED`` libraries to
10+
(:prop_gbl:`TARGET_SUPPORTS_SHARED_LIBS` is false), the
11+
:command:`add_library` command automatically converts ``SHARED`` libraries to
1212
``STATIC`` libraries to help users build projects on such platforms. However,
1313
the semantics of shared and static libraries are different enough that such
1414
automatic conversion cannot work in general. Projects using shared libraries

Help/prop_gbl/TARGET_SUPPORTS_SHARED_LIBS.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ TARGET_SUPPORTS_SHARED_LIBS
33

44
Does the target platform support shared libraries.
55

6-
TARGET_SUPPORTS_SHARED_LIBS is a boolean specifying whether the target
6+
``TARGET_SUPPORTS_SHARED_LIBS`` is a boolean specifying whether the target
77
platform supports shared libraries. Basically all current general
8-
general purpose OS do so, the exception are usually embedded systems
8+
purpose OS do so, the exceptions are usually embedded systems
99
with no or special OSs.

0 commit comments

Comments
 (0)