diff options
| author | Brad King <brad.king@kitware.com> | 2022-10-31 13:44:54 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2022-10-31 13:45:13 (GMT) |
| commit | fb862dd3ac3ba5b613067ba9c07eeb5c6921b41b (patch) | |
| tree | 10ad343137416740bdf0e97ede12c06e5804b601 | |
| parent | 5e6a6a13ab369555a60886687a5e95526170a96b (diff) | |
| parent | 9a0ca7df6740d321b65d37d12127c5d0130ef011 (diff) | |
| download | CMake-fb862dd3ac3ba5b613067ba9c07eeb5c6921b41b.zip CMake-fb862dd3ac3ba5b613067ba9c07eeb5c6921b41b.tar.gz CMake-fb862dd3ac3ba5b613067ba9c07eeb5c6921b41b.tar.bz2 | |
Merge topic 'vs-dotnetsdk-arm64'
9a0ca7df67 Tests: Fix RunCMake.VsDotnetSdk with VS >= 17.3 on ARM64
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7842
| -rw-r--r-- | Tests/RunCMake/VsDotnetSdk/VsDotnetSdk.cmake | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/Tests/RunCMake/VsDotnetSdk/VsDotnetSdk.cmake b/Tests/RunCMake/VsDotnetSdk/VsDotnetSdk.cmake index c585f5e..bd914f8 100644 --- a/Tests/RunCMake/VsDotnetSdk/VsDotnetSdk.cmake +++ b/Tests/RunCMake/VsDotnetSdk/VsDotnetSdk.cmake @@ -6,16 +6,22 @@ project (DotNetSdk CSharp) set(CMAKE_DOTNET_TARGET_FRAMEWORK net472) 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) set_target_properties(dotNetSdkLib1 PROPERTIES - VS_GLOBAL_RuntimeIdentifier win10-x64) + VS_GLOBAL_RuntimeIdentifier ${VS_RT_IDENTIFIER}) add_executable(DotNetSdk csharponly.cs) target_link_libraries(DotNetSdk dotNetSdkLib1) set_target_properties(DotNetSdk PROPERTIES - VS_GLOBAL_RuntimeIdentifier win10-x64 + VS_GLOBAL_RuntimeIdentifier ${VS_RT_IDENTIFIER} VS_DOTNET_REFERENCE_SomeDll ${PROJECT_SOURCE_DIR}/SomeDll.dll) |