Fixed: X64 not detected with CMake 2.8.11
This commit is contained in:
parent
a2f91ce484
commit
e74913f589
1 changed files with 4 additions and 4 deletions
|
@ -387,11 +387,11 @@ MACRO(NL_SETUP_BUILD)
|
||||||
|
|
||||||
SET(HOST_CPU ${CMAKE_HOST_SYSTEM_PROCESSOR})
|
SET(HOST_CPU ${CMAKE_HOST_SYSTEM_PROCESSOR})
|
||||||
|
|
||||||
IF(HOST_CPU MATCHES "amd64")
|
IF(HOST_CPU MATCHES "amd64|AMD64")
|
||||||
SET(HOST_CPU "x86_64")
|
SET(HOST_CPU "x86_64")
|
||||||
ELSEIF(HOST_CPU MATCHES "i.86")
|
ELSEIF(HOST_CPU MATCHES "i.86")
|
||||||
SET(HOST_CPU "x86")
|
SET(HOST_CPU "x86")
|
||||||
ENDIF(HOST_CPU MATCHES "amd64")
|
ENDIF(HOST_CPU MATCHES "amd64|AMD64")
|
||||||
|
|
||||||
# Determine target CPU
|
# Determine target CPU
|
||||||
|
|
||||||
|
@ -400,11 +400,11 @@ MACRO(NL_SETUP_BUILD)
|
||||||
SET(TARGET_CPU ${CMAKE_SYSTEM_PROCESSOR})
|
SET(TARGET_CPU ${CMAKE_SYSTEM_PROCESSOR})
|
||||||
ENDIF(NOT TARGET_CPU)
|
ENDIF(NOT TARGET_CPU)
|
||||||
|
|
||||||
IF(TARGET_CPU MATCHES "amd64")
|
IF(TARGET_CPU MATCHES "amd64|AMD64")
|
||||||
SET(TARGET_CPU "x86_64")
|
SET(TARGET_CPU "x86_64")
|
||||||
ELSEIF(TARGET_CPU MATCHES "i.86")
|
ELSEIF(TARGET_CPU MATCHES "i.86")
|
||||||
SET(TARGET_CPU "x86")
|
SET(TARGET_CPU "x86")
|
||||||
ENDIF(TARGET_CPU MATCHES "amd64")
|
ENDIF(TARGET_CPU MATCHES "amd64|AMD64")
|
||||||
|
|
||||||
IF(${CMAKE_CXX_COMPILER_ID} MATCHES "Clang")
|
IF(${CMAKE_CXX_COMPILER_ID} MATCHES "Clang")
|
||||||
SET(CLANG ON)
|
SET(CLANG ON)
|
||||||
|
|
Loading…
Reference in a new issue