فهرست منبع

Merge topic 'cpack-nuget-native'

c358872976 CPack/NuGet: Add native0.0 to build dependencies in groups

Acked-by: Kitware Robot <[email protected]>
Merge-request: !9829
Brad King 1 سال پیش
والد
کامیت
4aca6d8327
1فایلهای تغییر یافته به همراه3 افزوده شده و 0 حذف شده
  1. 3 0
      Modules/Internal/CPack/CPackNuGet.cmake

+ 3 - 0
Modules/Internal/CPack/CPackNuGet.cmake

@@ -404,6 +404,7 @@ function(_cpack_nuget_convert_tfm_to_frameworkname TFM OUTPUT_VAR_NAME)
     # 2. netstandard13  -> .NETStandard1.3
     # 2. netstandard13  -> .NETStandard1.3
     # 3. netcoreapp21   -> .NETCoreApp2.1
     # 3. netcoreapp21   -> .NETCoreApp2.1
     # 4. dotnet50       -> .NETPlatform5.0
     # 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
     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)
         _cpack_nuget_get_dotted_version("${CMAKE_MATCH_1}" dotted_version)
         set(framework_name ".NETFramework${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]+)*)$")
     elseif(TFM MATCHES "^dotnet([0-9]+(\.[0-9]+)*)$")
         _cpack_nuget_get_dotted_version("${CMAKE_MATCH_1}" dotted_version)
         _cpack_nuget_get_dotted_version("${CMAKE_MATCH_1}" dotted_version)
         set(framework_name ".NETPlatform${dotted_version}")
         set(framework_name ".NETPlatform${dotted_version}")
+    elseif(TFM STREQUAL "native0.0")
+        set(framework_name "${TFM}")
     else()
     else()
         message(FATAL_ERROR "Target Framework Moniker '${TFM}' not recognized")
         message(FATAL_ERROR "Target Framework Moniker '${TFM}' not recognized")
     endif()
     endif()