fix use of CMAKE_SYSTEM_PROCESSOR

This commit is contained in:
xantares 2013-10-23 20:19:52 +02:00
parent e273d94db8
commit e5baf1e05e

View File

@ -368,14 +368,18 @@ if(MINGW)
"<CMAKE_RC_COMPILER> <FLAGS> --target=${rc_target} <DEFINES> -i <SOURCE> -o <OBJECT>")
endmacro()
if( ${CMAKE_SYSTEM_PROCESSOR} MATCHES "i386"
OR ${CMAKE_SYSTEM_PROCESSOR} MATCHES "i486"
OR ${CMAKE_SYSTEM_PROCESSOR} MATCHES "i586"
OR ${CMAKE_SYSTEM_PROCESSOR} MATCHES "i686"
if (NOT CMAKE_SYSTEM_PROCESSOR )
set (CMAKE_SYSTEM_PROCESSOR ${CMAKE_HOST_SYSTEM_PROCESSOR} )
endif ()
if( CMAKE_SYSTEM_PROCESSOR MATCHES "i386"
OR CMAKE_SYSTEM_PROCESSOR MATCHES "i486"
OR CMAKE_SYSTEM_PROCESSOR MATCHES "i586"
OR CMAKE_SYSTEM_PROCESSOR MATCHES "i686"
# This also happens on x86_64 systems...what a worthless variable
OR ${CMAKE_SYSTEM_PROCESSOR} MATCHES "x86"
OR ${CMAKE_SYSTEM_PROCESSOR} MATCHES "x86_64"
OR ${CMAKE_SYSTEM_PROCESSOR} MATCHES "amd64")
OR CMAKE_SYSTEM_PROCESSOR MATCHES "x86"
OR CMAKE_SYSTEM_PROCESSOR MATCHES "x86_64"
OR CMAKE_SYSTEM_PROCESSOR MATCHES "amd64")
if(CMAKE_SIZEOF_VOID_P EQUAL 8)
set_rc_arch("pe-x86-64")