From a6ee74b58d3552734373c83bca5e8b130884b739 Mon Sep 17 00:00:00 2001 From: Ryan Houdek Date: Mon, 17 Mar 2014 11:33:11 -0500 Subject: [PATCH 1/3] Fix arch detection on x86. --- CMakeLists.txt | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index ab440907bc..f0ea4e87e3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -131,7 +131,11 @@ else() add_definitions(-D_ARCH_32=1) endif() -if(${CMAKE_SYSTEM_PROCESSOR} MATCHES "^x86" OR ${CMAKE_SYSTEM_NAME} MATCHES "Darwin") +if(${CMAKE_SYSTEM_PROCESSOR} MATCHES "^x86" OR + ${CMAKE_SYSTEM_PROCESSOR} MATCHES "i686" OR + ${CMAKE_SYSTEM_PROCESSOR} MATCHES "i486" OR + ${CMAKE_SYSTEM_PROCESSOR} MATCHES "i386" OR + ${CMAKE_SYSTEM_NAME} MATCHES "Darwin") add_definitions(-msse2) set(_M_X86 1) add_definitions(-D_M_X86=1) From d4c53eed012225deea49dff983c24ee69cca45ce Mon Sep 17 00:00:00 2001 From: Ryan Houdek Date: Mon, 17 Mar 2014 11:36:27 -0500 Subject: [PATCH 2/3] Fix arch detection on x86. --- CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index f0ea4e87e3..e350e62252 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -164,6 +164,7 @@ elseif(${CMAKE_SYSTEM_PROCESSOR} MATCHES "aarch64") set(_M_GENERIC 1) add_definitions(-D_M_GENERIC=1) else() + message("Warning! Building generic build!") set(_M_GENERIC 1) add_definitions(-D_M_GENERIC=1) endif() From 8ecb7524bc6e25896c4e0f2b1f78be12862b2374 Mon Sep 17 00:00:00 2001 From: Ryan Houdek Date: Mon, 17 Mar 2014 11:46:19 -0500 Subject: [PATCH 3/3] Fix arch detection on x86. --- CMakeLists.txt | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index e350e62252..5e6609e72a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -132,9 +132,7 @@ else() endif() if(${CMAKE_SYSTEM_PROCESSOR} MATCHES "^x86" OR - ${CMAKE_SYSTEM_PROCESSOR} MATCHES "i686" OR - ${CMAKE_SYSTEM_PROCESSOR} MATCHES "i486" OR - ${CMAKE_SYSTEM_PROCESSOR} MATCHES "i386" OR + ${CMAKE_SYSTEM_PROCESSOR} MATCHES "i.86" OR ${CMAKE_SYSTEM_NAME} MATCHES "Darwin") add_definitions(-msse2) set(_M_X86 1)