diff options
author | Viktor Szakats <commit@vsz.me> | 2023-11-07 17:00:56 +0000 |
---|---|---|
committer | Viktor Szakats <commit@vsz.me> | 2023-11-07 17:03:12 +0000 |
commit | abf3be5c56f68ecf4fe1e268d8a5515d8c8734ec (patch) | |
tree | c3a1d9ed50444229d6954da45358832a3da2a817 | |
parent | 27486b12e1793432dbc324fc8836c2c921d03fce (diff) | |
download | portable-abf3be5c56f68ecf4fe1e268d8a5515d8c8734ec.tar.gz portable-abf3be5c56f68ecf4fe1e268d8a5515d8c8734ec.tar.bz2 portable-abf3be5c56f68ecf4fe1e268d8a5515d8c8734ec.zip |
always check `CMAKE_SYSTEM_PROCESSOR` with `MATCHES`
This makes it accept values consistently. Before this patch
mingw-w64, Apple and SunOS did not accept a CPU if it had
a suffix or prefix (e.g. a triplet), while other targets did.
-rw-r--r-- | CMakeLists.txt | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 6695313..e8f9327 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt | |||
@@ -337,7 +337,7 @@ if(CMAKE_SYSTEM_PROCESSOR MATCHES "(aarch64|arm64|ARM64)") | |||
337 | set(HOST_AARCH64 true) | 337 | set(HOST_AARCH64 true) |
338 | elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "arm") | 338 | elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "arm") |
339 | set(HOST_ARM true) | 339 | set(HOST_ARM true) |
340 | elseif(CMAKE_SYSTEM_NAME STREQUAL "SunOS" AND CMAKE_SYSTEM_PROCESSOR STREQUAL "i386") | 340 | elseif(CMAKE_SYSTEM_NAME STREQUAL "SunOS" AND CMAKE_SYSTEM_PROCESSOR MATCHES "i386") |
341 | set(HOST_X86_64 true) | 341 | set(HOST_X86_64 true) |
342 | elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "(x86_64|amd64|AMD64)") | 342 | elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "(x86_64|amd64|AMD64)") |
343 | set(HOST_X86_64 true) | 343 | set(HOST_X86_64 true) |
@@ -367,16 +367,16 @@ if(ENABLE_ASM) | |||
367 | elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "arm" AND | 367 | elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "arm" AND |
368 | NOT CMAKE_SYSTEM_PROCESSOR MATCHES "arm64") | 368 | NOT CMAKE_SYSTEM_PROCESSOR MATCHES "arm64") |
369 | set(HOST_ASM_ELF_ARMV4 true) | 369 | set(HOST_ASM_ELF_ARMV4 true) |
370 | elseif(CMAKE_SYSTEM_NAME STREQUAL "SunOS" AND CMAKE_SYSTEM_PROCESSOR STREQUAL "i386") | 370 | elseif(CMAKE_SYSTEM_NAME STREQUAL "SunOS" AND CMAKE_SYSTEM_PROCESSOR MATCHES "i386") |
371 | set(HOST_ASM_ELF_X86_64 true) | 371 | set(HOST_ASM_ELF_X86_64 true) |
372 | endif() | 372 | endif() |
373 | add_definitions(-DHAVE_GNU_STACK) | 373 | add_definitions(-DHAVE_GNU_STACK) |
374 | elseif(APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64") | 374 | elseif(APPLE AND CMAKE_SYSTEM_PROCESSOR MATCHES "x86_64") |
375 | set(HOST_ASM_MACOSX_X86_64 true) | 375 | set(HOST_ASM_MACOSX_X86_64 true) |
376 | elseif(MSVC AND (CMAKE_GENERATOR MATCHES "Win64" OR CMAKE_GENERATOR_PLATFORM STREQUAL "x64")) | 376 | elseif(MSVC AND (CMAKE_GENERATOR MATCHES "Win64" OR CMAKE_GENERATOR_PLATFORM STREQUAL "x64")) |
377 | set(HOST_ASM_MASM_X86_64 true) | 377 | set(HOST_ASM_MASM_X86_64 true) |
378 | ENABLE_LANGUAGE(ASM_MASM) | 378 | ENABLE_LANGUAGE(ASM_MASM) |
379 | elseif(MINGW AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64") | 379 | elseif(MINGW AND CMAKE_SYSTEM_PROCESSOR MATCHES "x86_64") |
380 | set(HOST_ASM_MINGW64_X86_64 true) | 380 | set(HOST_ASM_MINGW64_X86_64 true) |
381 | endif() | 381 | endif() |
382 | endif() | 382 | endif() |