Some fixes

Author: sergcpp

CMakeLists.txt

@@ -37,7 +37,7 @@ if(MSVC)
     endif()
     add_compile_definitions(VK_USE_PLATFORM_WIN32_KHR)
 else(MSVC)
-    if(NOT CMAKE_SYSTEM_NAME MATCHES "Android" AND NOT CMAKE_GENERATOR_PLATFORM MATCHES "ARM64")
+    if(NOT CMAKE_SYSTEM_NAME MATCHES "Android" AND NOT CMAKE_GENERATOR_PLATFORM MATCHES "ARM64" AND NOT CMAKE_APPLE_SILICON_PROCESSOR STREQUAL "arm64")
         set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -msse2 -mno-avx -fno-strict-aliasing -Wno-unused-command-line-argument")
         if (NOT DEFINED CMAKE_CXX_FLAGS_ASAN OR CMAKE_CXX_FLAGS_ASAN STREQUAL "")
             set(CMAKE_CXX_FLAGS_ASAN "${CMAKE_CXX_FLAGS_DEBUG} -fsanitize=address")
@@ -178,7 +178,7 @@ if(ENABLE_DX_IMPL AND WIN32)
     )
 endif(ENABLE_DX_IMPL AND WIN32)
 
-if(NOT CMAKE_GENERATOR_PLATFORM MATCHES "ARM64")
+if(NOT CMAKE_GENERATOR_PLATFORM MATCHES "ARM64" AND NOT CMAKE_APPLE_SILICON_PROCESSOR STREQUAL "arm64")
     if(MSVC)
         if(NOT CMAKE_CL_64)
             set_source_files_properties(internal/TextureUtilsSSE2.cpp PROPERTIES COMPILE_FLAGS /arch:SSE2)
@@ -199,7 +199,7 @@ if(NOT CMAKE_GENERATOR_PLATFORM MATCHES "ARM64")
         set_source_files_properties(internal/RendererAVX2.cpp PROPERTIES COMPILE_FLAGS "-mavx2 -mfma")
         set_source_files_properties(internal/RendererAVX512.cpp PROPERTIES COMPILE_FLAGS "-mavx2 -mfma -mavx512f -mavx512bw -mavx512dq -mavx512vl")
     endif()
-endif(NOT CMAKE_GENERATOR_PLATFORM MATCHES "ARM64")
+endif(NOT CMAKE_GENERATOR_PLATFORM MATCHES "ARM64" AND NOT CMAKE_APPLE_SILICON_PROCESSOR STREQUAL "arm64")
 
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/Config.h.in ${CMAKE_CURRENT_SOURCE_DIR}/Config.h)
 

tests/CMakeLists.txt

@@ -47,7 +47,7 @@ if (MSVC)
     set_source_files_properties(test_simd.cpp PROPERTIES COMPILE_FLAGS /Ob0)
 endif()
 
-if(NOT "${CMAKE_GENERATOR_PLATFORM}" STREQUAL "ARM64")
+if(NOT "${CMAKE_GENERATOR_PLATFORM}" STREQUAL "ARM64" AND NOT CMAKE_APPLE_SILICON_PROCESSOR STREQUAL "arm64")
     if (MSVC)
         if (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
             set_source_files_properties(test_simd_sse41.cpp PROPERTIES COMPILE_FLAGS -msse4.1)
@@ -63,7 +63,7 @@ if(NOT "${CMAKE_GENERATOR_PLATFORM}" STREQUAL "ARM64")
         set_source_files_properties(test_simd_avx2.cpp PROPERTIES COMPILE_FLAGS "-mavx2 -mfma")
         set_source_files_properties(test_simd_avx512.cpp PROPERTIES COMPILE_FLAGS "-mavx2 -mfma -mavx512f -mavx512bw -mavx512dq -mavx512vl")
     endif()
-endif(NOT "${CMAKE_GENERATOR_PLATFORM}" STREQUAL "ARM64")
+endif(NOT "${CMAKE_GENERATOR_PLATFORM}" STREQUAL "ARM64" AND NOT CMAKE_APPLE_SILICON_PROCESSOR STREQUAL "arm64")
 
 target_link_libraries(test_Ray Ray ${LIBS})