Handle BINARY=32 option on X86_64
This commit is contained in:
parent
9d684f2af1
commit
6957dbdafd
|
@ -39,10 +39,18 @@ elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "ppc.*|power.*|Power.*")
|
||||||
elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "mips64.*")
|
elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "mips64.*")
|
||||||
set(MIPS64 1)
|
set(MIPS64 1)
|
||||||
elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "amd64.*|x86_64.*|AMD64.*")
|
elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "amd64.*|x86_64.*|AMD64.*")
|
||||||
if("${CMAKE_SIZEOF_VOID_P}" EQUAL "8")
|
if (NOT BINARY)
|
||||||
set(X86_64 1)
|
if("${CMAKE_SIZEOF_VOID_P}" EQUAL "8")
|
||||||
|
set(X86_64 1)
|
||||||
|
else()
|
||||||
|
set(X86 1)
|
||||||
|
endif()
|
||||||
else()
|
else()
|
||||||
set(X86 1)
|
if (${BINARY} EQUAL "64")
|
||||||
|
set(X86_64 1)
|
||||||
|
else ()
|
||||||
|
set(X86 1)
|
||||||
|
endif()
|
||||||
endif()
|
endif()
|
||||||
elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "i686.*|i386.*|x86.*|amd64.*|AMD64.*")
|
elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "i686.*|i386.*|x86.*|amd64.*|AMD64.*")
|
||||||
set(X86 1)
|
set(X86 1)
|
||||||
|
@ -54,6 +62,22 @@ elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^(aarch64.*|AARCH64.*)")
|
||||||
else()
|
else()
|
||||||
set(ARM 1)
|
set(ARM 1)
|
||||||
endif()
|
endif()
|
||||||
|
elseif (${CMAKE_CROSSCOMPILING})
|
||||||
|
if (${TARGET} STREQUAL "CORE2")
|
||||||
|
if (NOT BINARY)
|
||||||
|
set(X86 1)
|
||||||
|
elseif (${BINARY} EQUAL "64")
|
||||||
|
set(X86_64 1)
|
||||||
|
else ()
|
||||||
|
set(X86 1)
|
||||||
|
endif()
|
||||||
|
elseif (${TARGET} STREQUAL "ARMV7")
|
||||||
|
set(ARM 1)
|
||||||
|
else()
|
||||||
|
set(ARM64 1)
|
||||||
|
endif ()
|
||||||
|
else ()
|
||||||
|
message(WARNING "Target ARCH could not be determined, got \"${CMAKE_SYSTEM_PROCESSOR}\"")
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
if (X86_64)
|
if (X86_64)
|
||||||
|
@ -92,4 +116,3 @@ set (CCOMMON_OPT "${CCOMMON_OPT} -DNO_AVX512")
|
||||||
endif()
|
endif()
|
||||||
file(REMOVE "avx512.tmp" "avx512.o")
|
file(REMOVE "avx512.tmp" "avx512.o")
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue