diff options
| author | Brad King <brad.king@kitware.com> | 2019-12-09 16:20:26 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2019-12-09 16:20:55 (GMT) |
| commit | 51b87bcc6225b90c024abbacad2a8708ef96ae8b (patch) | |
| tree | 3600687951acd4686a61703fca4b936facc9b572 | |
| parent | 1da7fa3b478bd3efde96072157c693c4d71d1967 (diff) | |
| parent | 161a19e54717a837918519c0e29ad5f3c2590200 (diff) | |
| download | CMake-51b87bcc6225b90c024abbacad2a8708ef96ae8b.zip CMake-51b87bcc6225b90c024abbacad2a8708ef96ae8b.tar.gz CMake-51b87bcc6225b90c024abbacad2a8708ef96ae8b.tar.bz2 | |
Merge topic 'CPackNuGet-version-spec'
161a19e547 CPackNuGet: Fix handling of version specs with '['
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4082
| -rw-r--r-- | Modules/Internal/CPack/CPackNuGet.cmake | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/Modules/Internal/CPack/CPackNuGet.cmake b/Modules/Internal/CPack/CPackNuGet.cmake index b46a7b1..1f4bcfd 100644 --- a/Modules/Internal/CPack/CPackNuGet.cmake +++ b/Modules/Internal/CPack/CPackNuGet.cmake @@ -239,20 +239,13 @@ function(_cpack_nuget_render_spec) if(_ver) _cpack_nuget_debug(" got `${_dep}` dependency version ${_ver}") - list(APPEND _collected_deps "<dependency id=\"${_dep}\" version=\"${_ver}\" />") + string(CONCAT _collected_deps "${_collected_deps}" " <dependency id=\"${_dep}\" version=\"${_ver}\" />\n") endif() endforeach() # Render deps into the variable if(_collected_deps) - set(_CPACK_NUGET_DEPENDENCIES_TAG "<dependencies>\n") - foreach(_line IN LISTS _collected_deps) - string( - APPEND _CPACK_NUGET_DEPENDENCIES_TAG - " ${_line}\n" - ) - endforeach() - string(APPEND _CPACK_NUGET_DEPENDENCIES_TAG " </dependencies>") + string(CONCAT _CPACK_NUGET_DEPENDENCIES_TAG "<dependencies>\n" "${_collected_deps}" " </dependencies>") endif() # Render the spec file |