| Andrew Geissler | 82c905d | 2020-04-13 13:39:40 -0500 | [diff] [blame] | 1 | From 5de183dc436bb647361ab641d891c113e6a7dadd Mon Sep 17 00:00:00 2001 |
| 2 | From: Khem Raj <raj.khem@gmail.com> |
| 3 | Date: Sun, 8 Mar 2020 16:30:48 -0700 |
| 4 | Subject: [PATCH] cmake: Use a regular expression to match x86 architectures |
| 5 | |
| 6 | in OE we use i686 for qemux86 and this results in |
| 7 | |
| 8 | -- INFO - Target arch is i686 |
| 9 | CMake Error at CMakeLists.txt:191 (message): |
| 10 | Only x86, arm, mips, PERIPHERALMAN and mock platforms currently supported |
| 11 | |
| 12 | So using a wildcard helps in using any x86 arch |
| 13 | |
| 14 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
| 15 | --- |
| Patrick Williams | 520786c | 2023-06-25 16:20:36 -0500 | [diff] [blame] | 16 | Upstream-Status: Pending |
| 17 | |
| Andrew Geissler | 82c905d | 2020-04-13 13:39:40 -0500 | [diff] [blame] | 18 | CMakeLists.txt | 3 +-- |
| 19 | 1 file changed, 1 insertion(+), 2 deletions(-) |
| 20 | |
| 21 | diff --git a/CMakeLists.txt b/CMakeLists.txt |
| 22 | index 250d9106..fb642722 100644 |
| 23 | --- a/CMakeLists.txt |
| 24 | +++ b/CMakeLists.txt |
| 25 | @@ -176,8 +176,7 @@ else () |
| 26 | message (STATUS "INFO - Override arch is ${DETECTED_ARCH}") |
| 27 | endif() |
| 28 | |
| 29 | -if (DETECTED_ARCH STREQUAL "i586" OR DETECTED_ARCH STREQUAL "x86_64" |
| 30 | - OR DETECTED_ARCH STREQUAL "i386") |
| 31 | +if (DETECTED_ARCH MATCHES "i?86" OR DETECTED_ARCH STREQUAL "x86_64") |
| 32 | set (X86PLAT ON) |
| 33 | elseif (DETECTED_ARCH MATCHES "arm.*" OR DETECTED_ARCH MATCHES "aarch64") |
| 34 | set (ARMPLAT ON) |
| 35 | -- |
| 36 | 2.25.1 |
| 37 | |