Skip to content

Commit 8057b52

Browse files
authored
Do not set IS_X86 when target cpu is armv7 (#7033)
1 parent ce3597f commit 8057b52

File tree

1 file changed

+6
-1
lines changed

1 file changed

+6
-1
lines changed

cmake/globals.cmake

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,19 @@ else()
99
endif()
1010

1111
set(IS_ARM64 FALSE)
12+
set(IS_ARMV7A FALSE)
1213

1314
if (NOT "${CMAKE_GENERATOR_PLATFORM}" STREQUAL "") # needed to cover Visual Studio generator
1415
if(CMAKE_GENERATOR_PLATFORM MATCHES "^(aarch64|arm64|ARM64)")
1516
set(IS_ARM64 TRUE)
17+
elseif(CMAKE_GENERATOR_PLATFORM MATCHES "^(armv7)")
18+
set(IS_ARMV7A TRUE)
1619
endif()
1720
else()
1821
if(CMAKE_SYSTEM_PROCESSOR MATCHES "^(aarch64|arm64|ARM64)")
1922
set(IS_ARM64 TRUE)
23+
elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^(armv7)")
24+
set(IS_ARMV7A TRUE)
2025
endif()
2126
endif()
2227

@@ -33,6 +38,6 @@ else()
3338
endif()
3439

3540
set(IS_X86 FALSE)
36-
if (NOT IS_ARM64 AND NOT IS_RISCV)
41+
if (NOT IS_ARM64 AND NOT IS_RISCV AND NOT IS_ARMV7A)
3742
set(IS_X86 TRUE)
3843
endif()

0 commit comments

Comments
 (0)