From c3588729765e4a5172099ae2ffed8d213b8504d7 Mon Sep 17 00:00:00 2001 From: Diego Dassie Date: Wed, 18 Sep 2024 15:44:37 +0200 Subject: CPack/NuGet: Add native0.0 to build dependencies in groups Add the `native0.0` framework to the list of allowed frameworks allowing native (C/C++) NuGet packages. This extends commit 0f4d3664a9 (CPack/NuGet: Build dependencies in groups, 2024-06-01, v3.30.0-rc1~18^2). Fixes: #26305 --- Modules/Internal/CPack/CPackNuGet.cmake | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Modules/Internal/CPack/CPackNuGet.cmake b/Modules/Internal/CPack/CPackNuGet.cmake index bfd3ce5..83a8f43 100644 --- a/Modules/Internal/CPack/CPackNuGet.cmake +++ b/Modules/Internal/CPack/CPackNuGet.cmake @@ -404,6 +404,7 @@ function(_cpack_nuget_convert_tfm_to_frameworkname TFM OUTPUT_VAR_NAME) # 2. netstandard13 -> .NETStandard1.3 # 3. netcoreapp21 -> .NETCoreApp2.1 # 4. dotnet50 -> .NETPlatform5.0 + # 5. native0.0 -> native0.0 Support for native C++ and mixed C++/CLI projects if(TFM MATCHES "^net([1-4](.[\.0-9])?)$") # CMAKE_MATCH_1 holds the version part _cpack_nuget_get_dotted_version("${CMAKE_MATCH_1}" dotted_version) set(framework_name ".NETFramework${dotted_version}") @@ -418,6 +419,8 @@ function(_cpack_nuget_convert_tfm_to_frameworkname TFM OUTPUT_VAR_NAME) elseif(TFM MATCHES "^dotnet([0-9]+(\.[0-9]+)*)$") _cpack_nuget_get_dotted_version("${CMAKE_MATCH_1}" dotted_version) set(framework_name ".NETPlatform${dotted_version}") + elseif(TFM STREQUAL "native0.0") + set(framework_name "${TFM}") else() message(FATAL_ERROR "Target Framework Moniker '${TFM}' not recognized") endif() -- cgit v0.12