echo/CMake
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Tests: Fix ARM64 test conditions for non-VS generators

Browse Source
This commit is contained in:
Brad King 2022-10-21 09:25:08 -04:00
parent 16cb04dbe9
commit ce4babb566
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Tests/CMakeLists.txt
View File

@ -2164,7 +2164,7 @@ if(BUILD_TESTING)
if(MSVC AND NOT MSVC_VERSION LESS 1310 if(MSVC AND NOT MSVC_VERSION LESS 1310
AND (NOT CMAKE_GENERATOR MATCHES "Visual Studio 9 " AND (NOT CMAKE_GENERATOR MATCHES "Visual Studio 9 "
OR CMAKE_SIZEOF_VOID_P EQUAL 4) OR CMAKE_SIZEOF_VOID_P EQUAL 4)
AND (NOT CMAKE_VS_PLATFORM_NAME STREQUAL "ARM64") AND (NOT CMAKE_C_COMPILER_ARCHITECTURE_ID STREQUAL "ARM64")
) )
ADD_TEST_MACRO(VSMASM VSMASM) ADD_TEST_MACRO(VSMASM VSMASM)
endif() endif()

4
Tests/RunCMake/AutoExportDll/AutoExport.cmake
View File

@ -7,7 +7,7 @@ set_property(TARGET objlib PROPERTY POSITION_INDEPENDENT_CODE 1)
add_library(autoexport SHARED hello.cxx world.cxx foo.c $<TARGET_OBJECTS:objlib>) add_library(autoexport SHARED hello.cxx world.cxx foo.c $<TARGET_OBJECTS:objlib>)
add_library(autoexport3 SHARED cppCLI.cxx) 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_VS_PLATFORM_NAME STREQUAL "ARM64") AND NOT CMAKE_C_COMPILER_ARCHITECTURE_ID STREQUAL "ARM64")
set_property(TARGET autoexport3 PROPERTY COMMON_LANGUAGE_RUNTIME "") set_property(TARGET autoexport3 PROPERTY COMMON_LANGUAGE_RUNTIME "")
endif() endif()
@ -17,7 +17,7 @@ if(MSVC)
add_library(autoexport_for_exec SHARED hello2.c) add_library(autoexport_for_exec SHARED hello2.c)
target_link_libraries(autoexport_for_exec say) target_link_libraries(autoexport_for_exec say)
if(NOT MSVC_VERSION VERSION_LESS 1600 AND if(NOT MSVC_VERSION VERSION_LESS 1600 AND
NOT CMAKE_VS_PLATFORM_NAME STREQUAL "ARM64") NOT CMAKE_C_COMPILER_ARCHITECTURE_ID STREQUAL "ARM64")
enable_language(ASM_MASM) enable_language(ASM_MASM)
target_sources(autoexport PRIVATE nop.asm) target_sources(autoexport PRIVATE nop.asm)
set_property(SOURCE nop.asm PROPERTY COMPILE_FLAGS /safeseh) set_property(SOURCE nop.asm PROPERTY COMPILE_FLAGS /safeseh)