From c2390f7676d260d3afaa4e2ce6af72be3ac5a7f8 Mon Sep 17 00:00:00 2001 From: Craig Scott <craig.scott@crascit.com> Date: Fri, 14 Jun 2024 16:17:49 +1000 Subject: Help: Fix nuget example with unwanted comment and bad use of rst link --- Help/cpack_gen/nuget.rst | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/Help/cpack_gen/nuget.rst b/Help/cpack_gen/nuget.rst index ad3ec9f..e25364f 100644 --- a/Help/cpack_gen/nuget.rst +++ b/Help/cpack_gen/nuget.rst @@ -300,7 +300,7 @@ Example usage set(CPACK_GENERATOR NuGet) # Set up package metadata set(CPACK_PACKAGE_NAME SamplePackage) - set(CPACK_PACKAGE_VERSION "1.0.0") # Why doesn't this pick up the version from the project? + set(CPACK_PACKAGE_VERSION "1.0.0") set(CPACK_PACKAGE_VENDOR "Example Inc") set(CPACK_NUGET_PACKAGE_OWNERS "Example Inc") set(CPACK_PACKAGE_DESCRIPTION "A .NET wrapper around the foobar library for frobbling bratchens") @@ -319,12 +319,11 @@ Example usage set(CPACK_NUGET_PACKAGE_DEPENDENCIES "Baz") set(CPACK_NUGET_PACKAGE_DEPENDENCIES_Baz_VERSION "9.8.6") # NB: Since "net6.0" was listed but no dependencies have been specified, an empty group - # will be added to the nuspec file for this framework. This can be used to address `NU5128`_. + # will be added to the nuspec file for this framework. This can be used to address warning NU5128. include(CPack) - .. _nuget.org: https://www.nuget.org .. _version specification: https://learn.microsoft.com/en-us/nuget/concepts/package-versioning#version-ranges .. _SPDX license identifier: https://spdx.org/licenses -- cgit v0.12 From 6636b11997afdef0eca1effddcc0a0d4f4ae5d58 Mon Sep 17 00:00:00 2001 From: Craig Scott <craig.scott@crascit.com> Date: Fri, 14 Jun 2024 16:19:28 +1000 Subject: Help: Minor grammar and formatting cleanup --- Help/policy/CMP0164.rst | 4 ++-- Help/prop_gbl/TARGET_SUPPORTS_SHARED_LIBS.rst | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Help/policy/CMP0164.rst b/Help/policy/CMP0164.rst index 5ab2ee9..9702cc2 100644 --- a/Help/policy/CMP0164.rst +++ b/Help/policy/CMP0164.rst @@ -7,8 +7,8 @@ CMP0164 the platform. In CMake 3.29 and below, on platforms that do not support shared libraries -(:prop_gbl:`TARGET_SUPPORTS_SHARED_LIBS` is ``false``), the -:command:`add_library` command automatically converted ``SHARED`` libraries to +(:prop_gbl:`TARGET_SUPPORTS_SHARED_LIBS` is false), the +:command:`add_library` command automatically converts ``SHARED`` libraries to ``STATIC`` libraries to help users build projects on such platforms. However, the semantics of shared and static libraries are different enough that such automatic conversion cannot work in general. Projects using shared libraries diff --git a/Help/prop_gbl/TARGET_SUPPORTS_SHARED_LIBS.rst b/Help/prop_gbl/TARGET_SUPPORTS_SHARED_LIBS.rst index f6e89fb..6846b63 100644 --- a/Help/prop_gbl/TARGET_SUPPORTS_SHARED_LIBS.rst +++ b/Help/prop_gbl/TARGET_SUPPORTS_SHARED_LIBS.rst @@ -3,7 +3,7 @@ TARGET_SUPPORTS_SHARED_LIBS Does the target platform support shared libraries. -TARGET_SUPPORTS_SHARED_LIBS is a boolean specifying whether the target +``TARGET_SUPPORTS_SHARED_LIBS`` is a boolean specifying whether the target platform supports shared libraries. Basically all current general -general purpose OS do so, the exception are usually embedded systems +purpose OS do so, the exceptions are usually embedded systems with no or special OSs. -- cgit v0.12