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

Merge topic 'CPackNuget-dep-id'

Browse Source 
26367b4bb2 CPack/NuGet: Do not mangle non-C-identifier chars in dependencies

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4044
This commit is contained in:
Brad King
2019-11-18 14:50:03 +00:00
committed by Kitware Robot
parent e2cb9bcef2 26367b4bb2
commit bd16555717
1 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -230,13 +230,11 @@ function(_cpack_nuget_render_spec)
foreach(_dep IN LISTS _deps)
_cpack_nuget_debug(" checking dependency `${_dep}`")
string(MAKE_C_IDENTIFIER "${_dep}" _dep_id)
_cpack_nuget_variable_fallback(_ver DEPENDENCIES_${_dep_id}_VERSION)
_cpack_nuget_variable_fallback(_ver DEPENDENCIES_${_dep}_VERSION)
if(NOT _ver)
string(TOUPPER "${_dep_id}" _dep_id)
_cpack_nuget_variable_fallback(_ver DEPENDENCIES_${_dep_id}_VERSION)
string(TOUPPER "${_dep}" _dep_upper)
_cpack_nuget_variable_fallback(_ver DEPENDENCIES_${_dep_upper}_VERSION)
endif()
if(_ver)