cmake: tolower cpu string before detecting target. Always tolower the processor string and use the lowercase form when doing string compares to detect the target processor. BUG=aomedia:2504 Change-Id: I24bbb46ad8af2b75daebc54710df681a8f51acd1
diff --git a/build/cmake/aom_configure.cmake b/build/cmake/aom_configure.cmake index 754b114..a3c03ea 100644 --- a/build/cmake/aom_configure.cmake +++ b/build/cmake/aom_configure.cmake
@@ -52,8 +52,9 @@ # Detect target CPU. if(NOT AOM_TARGET_CPU) - if("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "AMD64" - OR "${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "x86_64") + string(TOLOWER "${CMAKE_SYSTEM_PROCESSOR}" cpu_lowercase) + if("${cpu_lowercase}" STREQUAL "amd64" + OR "${cpu_lowercase}" STREQUAL "x86_64") if(${CMAKE_SIZEOF_VOID_P} EQUAL 4) set(AOM_TARGET_CPU "x86") elseif(${CMAKE_SIZEOF_VOID_P} EQUAL 8) @@ -65,15 +66,15 @@ " CMAKE_SYSTEM_PROCESSOR=${CMAKE_SYSTEM_PROCESSOR}\n" " CMAKE_GENERATOR=${CMAKE_GENERATOR}\n") endif() - elseif("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "i386" - OR "${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "x86") + elseif("${cpu_lowercase}" STREQUAL "i386" + OR "${cpu_lowercase}" STREQUAL "x86") set(AOM_TARGET_CPU "x86") - elseif("${CMAKE_SYSTEM_PROCESSOR}" MATCHES "^arm" - OR "${CMAKE_SYSTEM_PROCESSOR}" MATCHES "^mips") - set(AOM_TARGET_CPU "${CMAKE_SYSTEM_PROCESSOR}") - elseif("${CMAKE_SYSTEM_PROCESSOR}" MATCHES "aarch64") + elseif("${cpu_lowercase}" MATCHES "^arm" + OR "${cpu_lowercase}" MATCHES "^mips") + set(AOM_TARGET_CPU "${cpu_lowercase}") + elseif("${cpu_lowercase}" MATCHES "aarch64") set(AOM_TARGET_CPU "arm64") - elseif("${CMAKE_SYSTEM_PROCESSOR}" MATCHES "^ppc") + elseif("${cpu_lowercase}" MATCHES "^ppc") set(AOM_TARGET_CPU "ppc") else() message(WARNING "The architecture ${CMAKE_SYSTEM_PROCESSOR} is not "