Improve astc cmake [ci build]

This commit is contained in:
halx99 2021-06-05 14:23:25 +08:00
parent 309e15b392
commit fcfe8d582e
1 changed files with 7 additions and 4 deletions

View File

@ -47,11 +47,14 @@ if (NOT DEFINED ISA_SIMD)
set(ASTC_SSE2_SWITCH "") set(ASTC_SSE2_SWITCH "")
set(OLD_REQUIRED_FLAGS ${CMAKE_REQUIRED_FLAGS}) set(OLD_REQUIRED_FLAGS ${CMAKE_REQUIRED_FLAGS})
if(NOT MSVC) if(MSVC)
# Yes GCC, really don't accept command line options you don't support set(CMAKE_REQUIRED_FLAGS "${OLD_REQUIRED_FLAGS} /WX")
check_c_compiler_flag("/arch:SSE2" ASTC_HAVE_MSSE2_SWITCH)
else()
set(CMAKE_REQUIRED_FLAGS "${OLD_REQUIRED_FLAGS} -Werror") set(CMAKE_REQUIRED_FLAGS "${OLD_REQUIRED_FLAGS} -Werror")
check_c_compiler_flag(-msse2 ASTC_HAVE_MSSE2_SWITCH)
endif() endif()
check_c_compiler_flag(-msse2 ASTC_HAVE_MSSE2_SWITCH)
set(CMAKE_REQUIRED_FLAGS ${OLD_REQUIRED_FLAGS}) set(CMAKE_REQUIRED_FLAGS ${OLD_REQUIRED_FLAGS})
unset(OLD_REQUIRED_FLAGS) unset(OLD_REQUIRED_FLAGS)
### end check -msse2 flag ### end check -msse2 flag
@ -92,7 +95,7 @@ if (NOT DEFINED ISA_SIMD)
set(ISA_SIMD "none") set(ISA_SIMD "none")
endif() endif()
message(AUTHOR_WARNING "ABORT ME:ISA_SIMD=${ISA_SIMD},ASTC_HAVE_MSSE2_SWITCH=${ASTC_HAVE_MSSE2_SWITCH},ASTC_HAVE_SSE4_INTRINSICS=${ASTC_HAVE_SSE4_INTRINSICS},ASTC_HAVE_NEON_INTRINSICS=${ASTC_HAVE_NEON_INTRINSICS}") message(AUTHOR_WARNING "ISA_SIMD=${ISA_SIMD},ASTC_HAVE_MSSE2_SWITCH=${ASTC_HAVE_MSSE2_SWITCH},ASTC_HAVE_SSE4_INTRINSICS=${ASTC_HAVE_SSE4_INTRINSICS},ASTC_HAVE_NEON_INTRINSICS=${ASTC_HAVE_NEON_INTRINSICS}")
endif() endif()
# Set up configuration for SIMD ISA builds # Set up configuration for SIMD ISA builds