From 0051406603ad423520f76aba2d91a129e8ce0bae Mon Sep 17 00:00:00 2001 From: Ivailo Monev Date: Fri, 5 Feb 2016 16:59:05 +0200 Subject: [PATCH] fix mkspecs architecture detection on pure Win32 Signed-off-by: Ivailo Monev --- mkspecs/mkspecs.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mkspecs/mkspecs.cmake b/mkspecs/mkspecs.cmake index 3f2f276f7..310a626e4 100644 --- a/mkspecs/mkspecs.cmake +++ b/mkspecs/mkspecs.cmake @@ -81,10 +81,10 @@ if(KATIE_ARCHITECTURE STREQUAL "auto") set(KATIE_ARCHITECTURE "arm") elseif(LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "^mips") set(KATIE_ARCHITECTURE "mips") - elseif(LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "i[3-6]86") - set(KATIE_ARCHITECTURE "i386") elseif(LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "(x86_64|amd64)") set(KATIE_ARCHITECTURE "x86_64") + elseif(LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "(x86|i[3-6]86)") ++ set(KATIE_ARCHITECTURE "i386") else() message(FATAL_ERROR "Unknown CPU '${CMAKE_SYSTEM_PROCESSOR}'") endif() -- 2.11.0