dany/libwebp
1
0
Fork 0
mirror of https://github.com/webmproject/libwebp.git synced 2025-08-26 05:48:41 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix universal macOS binaries builds

Browse Source 
Trying to compile libwebp with CMAKE_OSX_ARCHITECTURES="x86_64;arm64"
(also called as universal binary), will always fail due to SIMD
intrinsics check. CMake passes `-arch x86_64 -arch arm64` into the
compiler during `check_c_source_compiles`, which will always fail for
any flag, because either x86_64 or arm64 won't have it. This also
results in you not being able to compile the library due to errors like
"SSE2 register return with SSE2 disabled".

Change-Id: I32a41e4c64ce8c6a043083023a4018d512be124b
This commit is contained in:
prevter
2025-08-01 14:42:32 +03:00
committed by Prevter
parent 44257cb826
commit e329ca4c26
1 changed files with 26 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
cmake/cpu.cmake
View File

@ -18,11 +18,36 @@ function(webp_check_compiler_flag WEBP_SIMD_FLAG ENABLE_SIMD)
unset(WEBP_HAVE_FLAG_${WEBP_SIMD_FLAG} CACHE)
cmake_push_check_state()
set(CMAKE_REQUIRED_INCLUDES ${CMAKE_CURRENT_SOURCE_DIR})
# If building a universal binary on macOS, we need to check if one of the
# architectures supports the SIMD flag.
set(OSX_CHECK "")
if(APPLE AND CMAKE_OSX_ARCHITECTURES)
list(LENGTH CMAKE_OSX_ARCHITECTURES ARCH_COUNT)
if(ARCH_COUNT EQUAL 2)
set(OSX_CHECK "defined(WEBP_CAN_HAVE_${WEBP_SIMD_FLAG}) &&")
endif()
endif()
check_c_source_compiles(
"
#include \"${CMAKE_CURRENT_LIST_DIR}/../src/dsp/dsp.h\"
#if defined(__APPLE__)
#if defined(__x86_64__)
#define WEBP_CAN_HAVE_SSE2
#define WEBP_CAN_HAVE_SSE41
#define WEBP_CAN_HAVE_AVX2
#elif defined(__aarch64__)
#define WEBP_CAN_HAVE_NEON
#endif
// MIPS intrinsics are not supported on macOS, but we have to define them
// so that the check happens.
#define WEBP_CAN_HAVE_MIPS32
#define WEBP_CAN_HAVE_MIPS_DSP_R2
#define WEBP_CAN_HAVE_MSA
#endif
int main(void) {
#if !defined(WEBP_USE_${WEBP_SIMD_FLAG})
#if ${OSX_CHECK} !defined(WEBP_USE_${WEBP_SIMD_FLAG})
this is not valid code
#endif
return 0;