From b0310cb34e912d15340d02a179a81311325b4199 Mon Sep 17 00:00:00 2001 From: Brent Cook Date: Mon, 27 Feb 2023 05:48:23 -0600 Subject: set CMAKE_SYSTEM_PROCESSOR when cross compiling handle x86 as option for 32-bit x86 on Windows --- CMakeLists.txt | 8 ++++---- scripts/i686-w64-mingw32.cmake | 1 + scripts/x86_64-w64-mingw32.cmake | 1 + 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 5fddd7f..7e8c0de 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -312,9 +312,11 @@ elseif("${CMAKE_SYSTEM_PROCESSOR}" MATCHES "arm") set(HOST_ARM true) elseif("${CMAKE_SYSTEM_NAME}" STREQUAL "SunOS" AND "${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "i386") set(HOST_X86_64 true) -elseif("${CMAKE_SYSTEM_NAME}" STREQUAL "i386") +elseif("${CMAKE_SYSTEM_PROCESSOR}" MATCHES "(x86_64|amd64)") + set(HOST_X86_64 true) +elseif("${CMAKE_SYSTEM_NAME}" MATCHES "[i386|x86]") set(HOST_I386 true) -elseif("${CMAKE_SYSTEM_NAME}" STREQUAL "mips64") +elseif("${CMAKE_SYSTEM_NAME}" MATCHES "mips64") set(HOST_MIPS64 true) elseif("${CMAKE_SYSTEM_NAME}" MATCHES "mips") set(HOST_MIPS true) @@ -326,8 +328,6 @@ elseif("${CMAKE_SYSTEM_NAME}" MATCHES "riscv64") set(HOST_RISCV64 true) elseif("${CMAKE_SYSTEM_NAME}" MATCHES "sparc64") set(HOST_SPARC64 true) -elseif("${CMAKE_SYSTEM_PROCESSOR}" MATCHES "(x86_64|amd64)") - set(HOST_X86_64 true) else() set(ENABLE_ASM false) endif() diff --git a/scripts/i686-w64-mingw32.cmake b/scripts/i686-w64-mingw32.cmake index 58efd58..bad60db 100644 --- a/scripts/i686-w64-mingw32.cmake +++ b/scripts/i686-w64-mingw32.cmake @@ -1,4 +1,5 @@ SET(CMAKE_SYSTEM_NAME Windows) +SET(CMAKE_SYSTEM_PROCESSOR i386) SET(CMAKE_C_COMPILER i686-w64-mingw32-gcc) SET(CMAKE_CXX_COMPILER i686-w64-mingw32-g++) SET(CMAKE_RC_COMPILER i686-w64-mingw32-windres) diff --git a/scripts/x86_64-w64-mingw32.cmake b/scripts/x86_64-w64-mingw32.cmake index c52b606..df65165 100644 --- a/scripts/x86_64-w64-mingw32.cmake +++ b/scripts/x86_64-w64-mingw32.cmake @@ -1,4 +1,5 @@ SET(CMAKE_SYSTEM_NAME Windows) +SET(CMAKE_SYSTEM_PROCESSOR amd64) SET(CMAKE_C_COMPILER x86_64-w64-mingw32-gcc) SET(CMAKE_CXX_COMPILER x86_64-w64-mingw32-g++) SET(CMAKE_RC_COMPILER x86_64-w64-mingw32-windres) -- cgit v1.2.3-55-g6feb