Skip to content

Commit 4e9faf3

Browse files
authored
Merge pull request #12771 from parona-source/fix-CMAKE_SYSTEM_PROCESSOR-usage-for-non-windows
CMake: fix checks for CMAKE_SYSTEM_PROCESSOR on non Windows platforms
2 parents 5e8ee8c + 68a6868 commit 4e9faf3

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ endif()
4848
include(Ccache)
4949

5050
#
51-
if ("${CMAKE_SYSTEM_PROCESSOR}" MATCHES "(x86|AMD64)")
51+
if ("${CMAKE_SYSTEM_PROCESSOR}" MATCHES "(i586|i686|x86|AMD64)")
5252
check_compiler_machine_option(flag SSE)
5353
if (NOT ${flag} STREQUAL "")
5454
set(HAVE_SSE_AT_COMPILE_TIME 1)

cmake/helpers/CheckCompilerMachineOption.cmake

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ function(check_compiler_machine_option outvar feature)
3131
endmacro()
3232

3333
set(_FLAGS)
34-
if("${CMAKE_SYSTEM_PROCESSOR}" MATCHES "(x86|AMD64)")
34+
if("${CMAKE_SYSTEM_PROCESSOR}" MATCHES "(i586|i686|x86|AMD64)")
3535
if(MSVC AND (${feature} MATCHES "SSE"))
3636
# SSE2 and SSE are default on
3737
set(_FLAGS " ")
@@ -100,7 +100,7 @@ function(check_compiler_machine_option outvar feature)
100100
endif()
101101
endif()
102102
endif()
103-
elseif("${CMAKE_SYSTEM_PROCESSOR}" MATCHES "(ARM|aarch64)")
103+
elseif("${CMAKE_SYSTEM_PROCESSOR}" MATCHES "(arm|ARM|aarch64)")
104104
if(MSVC)
105105
# TODO implement me
106106
elseif(CMAKE_CXX_COMPILER MATCHES "/(icpc|icc)$") # ICC (on Linux)

0 commit comments

Comments
 (0)