vcpkg/ports/libwebp/0007-fix-arm-build.patch
JonLiu1993 25be4c4c0b
[libwebp] Do not emit AVX when not requested by the toolchain (#21644)
Co-authored-by: Zhao Liu <v-zhli17@microsoft.com>
2023-07-14 11:27:50 -07:00

23 lines
969 B
Diff

diff --git a/cmake/cpu.cmake b/cmake/cpu.cmake
index bc0dbc9..f9b7327 100644
--- a/cmake/cpu.cmake
+++ b/cmake/cpu.cmake
@@ -48,7 +48,7 @@ if(MSVC AND CMAKE_C_COMPILER_ID STREQUAL "MSVC")
if(MSVC_VERSION GREATER_EQUAL 1800 AND NOT CMAKE_C_FLAGS MATCHES "/arch:")
set(SIMD_ENABLE_FLAGS)
else()
- set(SIMD_ENABLE_FLAGS "/arch:AVX;/arch:SSE2;;;;")
+ set(SIMD_ENABLE_FLAGS "/arch:SSE2;;;;;")
endif()
set(SIMD_DISABLE_FLAGS)
else()
@@ -97,7 +97,7 @@ foreach(I_SIMD RANGE ${WEBP_SIMD_FLAGS_RANGE})
set(CMAKE_REQUIRED_FLAGS ${SIMD_COMPILE_FLAG})
webp_check_compiler_flag(${WEBP_SIMD_FLAG} ${WEBP_ENABLE_SIMD})
else()
- if(MSVC AND SIMD_ENABLE_FLAGS)
+ if(MSVC AND NOT (CMAKE_GENERATOR_PLATFORM MATCHES "^ARM"))
# The detection for SSE2/SSE4 support under MSVC is based on the compiler
# version so e.g., clang-cl will require flags to enable the assembly.
list(GET SIMD_ENABLE_FLAGS ${I_SIMD} SIMD_COMPILE_FLAG)