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

Tests: Fix RunCMake.VsDotnetSdk with VS >= 17.3 on ARM64

Browse Source 
VS 17.3 provides an arm64-native version of the tool, but the test was
looking for the x64 version.
This commit is contained in:
Anthony Roberts
2022-10-28 15:48:21 +01:00
committed by Brad King
parent 59ae254316
commit 9a0ca7df67
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Tests/RunCMake/VsDotnetSdk/VsDotnetSdk.cmake
View File

@@ -6,16 +6,22 @@ project (DotNetSdk CSharp)
set(CMAKE_DOTNET_TARGET_FRAMEWORK net472) set(CMAKE_DOTNET_TARGET_FRAMEWORK net472)
set(CMAKE_DOTNET_SDK "Microsoft.NET.Sdk") set(CMAKE_DOTNET_SDK "Microsoft.NET.Sdk")
if(CMAKE_VS_PLATFORM_NAME STREQUAL "ARM64")
set(VS_RT_IDENTIFIER arm64)
else()
set(VS_RT_IDENTIFIER win10-x64)
endif()
add_library(dotNetSdkLib1 SHARED lib1.cs) add_library(dotNetSdkLib1 SHARED lib1.cs)
set_target_properties(dotNetSdkLib1 set_target_properties(dotNetSdkLib1
PROPERTIES PROPERTIES
VS_GLOBAL_RuntimeIdentifier win10-x64) VS_GLOBAL_RuntimeIdentifier ${VS_RT_IDENTIFIER})
add_executable(DotNetSdk csharponly.cs) add_executable(DotNetSdk csharponly.cs)
target_link_libraries(DotNetSdk dotNetSdkLib1) target_link_libraries(DotNetSdk dotNetSdkLib1)
set_target_properties(DotNetSdk set_target_properties(DotNetSdk
PROPERTIES PROPERTIES
VS_GLOBAL_RuntimeIdentifier win10-x64 VS_GLOBAL_RuntimeIdentifier ${VS_RT_IDENTIFIER}
VS_DOTNET_REFERENCE_SomeDll VS_DOTNET_REFERENCE_SomeDll
${PROJECT_SOURCE_DIR}/SomeDll.dll) ${PROJECT_SOURCE_DIR}/SomeDll.dll)