diff options
| author | Brad King <brad.king@kitware.com> | 2022-05-19 13:39:45 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2022-05-19 13:39:58 (GMT) |
| commit | 2ca51e6f746de3c3fdd5e488670bef70d73fb909 (patch) | |
| tree | ae2a30b792038d4e65884c06bc0dee4fd0283a85 | |
| parent | 640268c19b64d3063370872a13d267ef497139ee (diff) | |
| parent | 066ff258dbea32cda233109910606c617fedc59f (diff) | |
| download | CMake-2ca51e6f746de3c3fdd5e488670bef70d73fb909.zip CMake-2ca51e6f746de3c3fdd5e488670bef70d73fb909.tar.gz CMake-2ca51e6f746de3c3fdd5e488670bef70d73fb909.tar.bz2 | |
Merge topic 'cpack-nuget-components-on-windows' into release-3.23
066ff258db CPack/NuGet: Restore component packaging on Windows
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7280
| -rw-r--r-- | Modules/Internal/CPack/CPackNuGet.cmake | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/Modules/Internal/CPack/CPackNuGet.cmake b/Modules/Internal/CPack/CPackNuGet.cmake index fb363f4..056d025 100644 --- a/Modules/Internal/CPack/CPackNuGet.cmake +++ b/Modules/Internal/CPack/CPackNuGet.cmake @@ -332,7 +332,9 @@ endfunction() function(_cpack_nuget_make_files_tag) set(_files) foreach(_comp IN LISTS ARGN) - string(APPEND _files " <file src=\"${_comp}/**\" target=\".\" />\n") + cmake_path(APPEND _comp "**") + cmake_path(NATIVE_PATH _comp _comp) + string(APPEND _files " <file src=\"${_comp}\" target=\".\" />\n") endforeach() set(_CPACK_NUGET_FILES_TAG "<files>\n${_files} </files>" PARENT_SCOPE) endfunction() |