From 3e28ebc31e435f08fdedb4d7badf071c5bc17a2a Mon Sep 17 00:00:00 2001 From: Florent Castelli Date: Wed, 25 Jan 2017 05:44:56 +0100 Subject: [PATCH] cmake: Fix arch detection Windows arch is set to AMD64, and we don't really want ix86 either --- CMakeLists.txt | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index fb684b024d..170f896664 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -166,12 +166,7 @@ if(ENABLE_GENERIC) message(STATUS "Warning! Building generic build!") set(_M_GENERIC 1) add_definitions(-D_M_GENERIC=1) -elseif(_ARCH_64 AND ( - ${CMAKE_SYSTEM_PROCESSOR} MATCHES "^x86" OR - ${CMAKE_SYSTEM_PROCESSOR} MATCHES "i.86" OR - ${CMAKE_SYSTEM_PROCESSOR} MATCHES "amd64" OR - APPLE -)) +elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "x86_64|amd64|AMD64") set(_M_X86 1) set(_M_X86_64 1) add_definitions(-D_M_X86=1 -D_M_X86_64=1 -msse2)