diff options
| author | Brad King <brad.king@kitware.com> | 2019-11-18 14:50:03 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2019-11-18 14:50:14 (GMT) |
| commit | bd1655571738126eaf878960423a648cb34baf0b (patch) | |
| tree | ee9fe05812628b90c555ad622c0f080a7d7abce4 | |
| parent | e2cb9bcef22278564a15c696d3141fd2b3425a81 (diff) | |
| parent | 26367b4bb2be9013d3bc30deef8ef1eda866a5cd (diff) | |
| download | CMake-bd1655571738126eaf878960423a648cb34baf0b.zip CMake-bd1655571738126eaf878960423a648cb34baf0b.tar.gz CMake-bd1655571738126eaf878960423a648cb34baf0b.tar.bz2 | |
Merge topic 'CPackNuget-dep-id'
26367b4bb2 CPack/NuGet: Do not mangle non-C-identifier chars in dependencies
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4044
| -rw-r--r-- | Modules/Internal/CPack/CPackNuGet.cmake | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/Modules/Internal/CPack/CPackNuGet.cmake b/Modules/Internal/CPack/CPackNuGet.cmake index 82053b2..b46a7b1 100644 --- a/Modules/Internal/CPack/CPackNuGet.cmake +++ b/Modules/Internal/CPack/CPackNuGet.cmake @@ -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) |