OSDN Git Service

fix mkspecs architecture detection on pure Win32
authorIvailo Monev <xakepa10@gmail.com>
Fri, 5 Feb 2016 14:59:05 +0000 (16:59 +0200)
committerIvailo Monev <xakepa10@gmail.com>
Fri, 5 Feb 2016 14:59:05 +0000 (16:59 +0200)
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
mkspecs/mkspecs.cmake

index 3f2f276..310a626 100644 (file)
@@ -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()