mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-01-05 21:31:08 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge topic 'cpack-nuget-readme'

Browse Source 
ccde6f8048 CPack/NuGet: Add support for repository tag
2c616e85cf CPack/NuGet: Add support for readme tag

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9139
This commit is contained in:
Brad King
2024-01-09 14:59:03 +00:00
committed by Kitware Robot
parent 27d958b34c ccde6f8048
commit dda4232b4d
2 changed files with 23 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Modules/Internal/CPack/CPack.NuGet.nuspec.in
View File

@@ -15,12 +15,14 @@
@_CPACK_NUGET_LICENSE_TAG@
@_CPACK_NUGET_ICONURL_TAG@
@_CPACK_NUGET_ICON_TAG@
@_CPACK_NUGET_README_TAG@
@_CPACK_NUGET_REQUIRELICENSEACCEPTANCE_TAG@
@_CPACK_NUGET_SUMMARY_TAG@
@_CPACK_NUGET_RELEASENOTES_TAG@
@_CPACK_NUGET_COPYRIGHT_TAG@
@_CPACK_NUGET_LANGUAGE_TAG@
@_CPACK_NUGET_TAGS_TAG@
@_CPACK_NUGET_REPOSITORY_TAG@
@_CPACK_NUGET_DEPENDENCIES_TAG@
</metadata>
@_CPACK_NUGET_FILES_TAG@

21
Modules/Internal/CPack/CPackNuGet.cmake
View File

@@ -294,6 +294,27 @@ function(_cpack_nuget_render_spec)
# attributes: "type", "url", "branch", and "commit". While all fields are
# considered optional, they are not independent. Currently unsupported.
# NuGet >= 5.10
_cpack_nuget_variable_fallback_and_wrap_into_element(readme README)
set(_CPACK_NUGET_REPOSITORY_TAG)
_cpack_nuget_variable_fallback(_repo_type REPOSITORY_TYPE)
_cpack_nuget_variable_fallback(_repo_url REPOSITORY_URL)
if(_repo_type AND _repo_url)
set(_CPACK_NUGET_REPOSITORY_TAG "<repository type=\"${_repo_type}\" url=\"${_repo_url}\"")
_cpack_nuget_variable_fallback(_repo_br REPOSITORY_BRANCH)
if(_repo_br)
string(APPEND _CPACK_NUGET_REPOSITORY_TAG " branch=\"${_repo_br}\"")
endif()
_cpack_nuget_variable_fallback(_repo_commit REPOSITORY_COMMIT)
if(_repo_commit)
string(APPEND _CPACK_NUGET_REPOSITORY_TAG " commit=\"${_repo_commit}\"")
endif()
string(APPEND _CPACK_NUGET_REPOSITORY_TAG " />")
else()
message(AUTHOR_WARNING "Skip adding the `<repository .../>` element due to missing URL or type")
endif()
# Handle dependencies
_cpack_nuget_variable_fallback(_deps DEPENDENCIES)
set(_collected_deps)