Skip to content

CPack: Mismatch between NuGet configuration and current NuGet spec

Bob Apthorpe requested to merge apthorpe/cmake:21348-nuget-revision into master

Adds CPACK_NUGET_PACKAGE_LICENSE_FILENAME, CPACK_NUGET_PACKAGE_LICENSE_EXPRESSION, CPACK_NUGET_PACKAGE_ICON, and CPACK_NUGET_PACKAGE_LANGUAGE to Modules\Internal\CPack\CPackNuGet.cmake and Help\cpack_gen\nuget.rst. Adds _CPACK_NUGET_LICENSE_TAG, _CPACK_NUGET_ICON_TAG, and _CPACK_NUGET_LANGUAGE_TAG to Modules\Internal\CPack\CPack.NuGet.nuspec.in. The XML schema(?) in CPack.NuGet.nuspec.in has been updated from http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd to http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd

Finally, some minor grammatical and editorial changes were made to nuget.rst for clarification.

I have attempted to maintain code style but as this is my first MR for CMake, please review the user-facing variable names to ensure they are consistent with CMake nomenclature standards.

This change should not affect existing NuGet packaging. The new CPACK_NUGET_PACKAGE_... variables listed above are all optional and do not inherit any fallback values.

I've done some basic testing, backporting these changes to my local installation of CMake 3.18.4, and everything seems to work as intended.

Closes: #21348 (closed)
Topic-rename: cpack-nuget

Edited by Bob Apthorpe

Merge request reports