Merge pull request #162 from K-os/gh_update

SIMDE bugfix & threading optimizations
fraunhoferhhi · Jan 18, 2024 · cdc566c · cdc566c
2 parents bbc0ed4 + e31e9d3
commit cdc566c
Show file tree

Hide file tree

Showing 10 changed files with 477 additions and 345 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -18,9 +18,10 @@ list( APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules" )
 message( STATUS "CMAKE_MODULE_PATH: updating module path to: ${CMAKE_MODULE_PATH}" )
 
 set( VVDEC_ARM_SIMD_DEFAULT FALSE )
-if( "${CMAKE_SYSTEM_PROCESSOR}" MATCHES "aarch64\|arm"
+if( ( "${CMAKE_SYSTEM_PROCESSOR}" MATCHES "aarch64\|arm"
     OR "${CMAKE_CXX_COMPILER}" MATCHES "aarch64\|arm"
     OR "${CMAKE_OSX_ARCHITECTURES}" MATCHES "arm64\|armv" )
+    AND NOT "${CMAKE_OSX_ARCHITECTURES}" MATCHES "x86\|x64" )
   set( VVDEC_ARM_SIMD_DEFAULT TRUE )
 endif()