diff options
| author | Niyas Sait <niyas.sait@linaro.org> | 2022-05-10 15:29:37 (GMT) |
|---|---|---|
| committer | Niyas Sait <niyas.sait@linaro.org> | 2022-05-11 17:13:25 (GMT) |
| commit | 834422e0752514a06c868e3ec2df190171e8affe (patch) | |
| tree | ae95aa2417572b0c46dd1820a110c544509ff175 /Tests/RunCMake/AutoExportDll/AutoExport.cmake | |
| parent | cf6235719b7d5889ead0676e598b56bf677bd0ba (diff) | |
| download | CMake-834422e0752514a06c868e3ec2df190171e8affe.zip CMake-834422e0752514a06c868e3ec2df190171e8affe.tar.gz CMake-834422e0752514a06c868e3ec2df190171e8affe.tar.bz2 | |
Tests: Fix test failures for Windows Arm64 platforms
Diffstat (limited to 'Tests/RunCMake/AutoExportDll/AutoExport.cmake')
| -rw-r--r-- | Tests/RunCMake/AutoExportDll/AutoExport.cmake | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/Tests/RunCMake/AutoExportDll/AutoExport.cmake b/Tests/RunCMake/AutoExportDll/AutoExport.cmake index 85eff7e..dbcf4b8 100644 --- a/Tests/RunCMake/AutoExportDll/AutoExport.cmake +++ b/Tests/RunCMake/AutoExportDll/AutoExport.cmake @@ -6,7 +6,8 @@ add_library(objlib OBJECT objlib.c) set_property(TARGET objlib PROPERTY POSITION_INDEPENDENT_CODE 1) add_library(autoexport SHARED hello.cxx world.cxx foo.c $<TARGET_OBJECTS:objlib>) add_library(autoexport3 SHARED cppCLI.cxx) -if(MSVC AND NOT MSVC_VERSION VERSION_LESS 1600) +if(MSVC AND NOT MSVC_VERSION VERSION_LESS 1600 + AND NOT CMAKE_GENERATOR_PLATFORM STREQUAL "ARM64") set_property(TARGET autoexport3 PROPERTY COMMON_LANGUAGE_RUNTIME "") endif() @@ -15,7 +16,8 @@ if(MSVC) set_target_properties(say PROPERTIES ENABLE_EXPORTS ON) add_library(autoexport_for_exec SHARED hello2.c) target_link_libraries(autoexport_for_exec say) - if(NOT MSVC_VERSION VERSION_LESS 1600) + if(NOT MSVC_VERSION VERSION_LESS 1600 AND + NOT CMAKE_GENERATOR_PLATFORM STREQUAL "ARM64") enable_language(ASM_MASM) target_sources(autoexport PRIVATE nop.asm) set_property(SOURCE nop.asm PROPERTY COMPILE_FLAGS /safeseh) |