File tree Expand file tree Collapse file tree 1 file changed +6
-2
lines changed Expand file tree Collapse file tree 1 file changed +6
-2
lines changed Original file line number Diff line number Diff line change @@ -850,7 +850,9 @@ endif()
850850
851851set (ARCH_FLAGS "" )
852852
853- if ((${CMAKE_SYSTEM_PROCESSOR} MATCHES "arm" ) OR (${CMAKE_SYSTEM_PROCESSOR} MATCHES "aarch64" ) OR ("${CMAKE_GENERATOR_PLATFORM_LWR} " MATCHES "arm64" ))
853+ if (CMAKE_OSX_ARCHITECTURES STREQUAL "arm64" OR CMAKE_GENERATOR_PLATFORM_LWR STREQUAL "arm64" OR
854+ (NOT CMAKE_OSX_ARCHITECTURES AND NOT CMAKE_GENERATOR_PLATFORM_LWR AND
855+ CMAKE_SYSTEM_PROCESSOR MATCHES "^(aarch64|arm.*|ARM64)$" ))
854856 message (STATUS "ARM detected" )
855857 if (MSVC )
856858 add_compile_definitions (__ARM_NEON)
@@ -876,7 +878,9 @@ if ((${CMAKE_SYSTEM_PROCESSOR} MATCHES "arm") OR (${CMAKE_SYSTEM_PROCESSOR} MATC
876878 list (APPEND ARCH_FLAGS -mno-unaligned-access)
877879 endif ()
878880 endif ()
879- elseif (${CMAKE_SYSTEM_PROCESSOR} MATCHES "^(x86_64|i686|AMD64)$" OR "${CMAKE_GENERATOR_PLATFORM_LWR} " MATCHES "^(x86_64|i686|amd64|x64)$" )
881+ elseif (CMAKE_OSX_ARCHITECTURES STREQUAL "x86_64" OR CMAKE_GENERATOR_PLATFORM_LWR MATCHES "^(x86_64|i686|amd64|x64|win32)$" OR
882+ (NOT CMAKE_OSX_ARCHITECTURES AND NOT CMAKE_GENERATOR_PLATFORM_LWR AND
883+ CMAKE_SYSTEM_PROCESSOR MATCHES "^(x86_64|i686|AMD64)$" ))
880884 message (STATUS "x86 detected" )
881885 if (MSVC )
882886 # instruction set detection for MSVC only
You can’t perform that action at this time.
0 commit comments