diff options
| author | Brad King <brad.king@kitware.com> | 2022-10-31 13:44:54 +0000 |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2022-10-31 09:45:12 -0400 |
| commit | bb171688c91fce95405e4b91db8faad020c270f3 (patch) | |
| tree | 12d4ce2221c7dae58361974e6a9c953a718dbbad /Tests | |
| parent | d69b77a9ca22547cf0e058fbb613173a1339b176 (diff) | |
| parent | 9a0ca7df6740d321b65d37d12127c5d0130ef011 (diff) | |
| download | cmake-bb171688c91fce95405e4b91db8faad020c270f3.tar.gz | |
Merge topic 'vs-dotnetsdk-arm64' into release-3.25
9a0ca7df67 Tests: Fix RunCMake.VsDotnetSdk with VS >= 17.3 on ARM64
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7842
Diffstat (limited to 'Tests')
| -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 c585f5ecec..bd914f821e 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) |