generic-library/libzmq
1
0
Fork 0
mirror of https://github.com/zeromq/libzmq.git synced 2025-02-03 23:55:51 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #719 from xantares/mingw_arch

Browse Source 
fix use of CMAKE_SYSTEM_PROCESSOR
This commit is contained in:
Pieter Hintjens 2013-10-23 12:17:55 -07:00
commit 770d52ecfe
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
CMakeLists.txt
View File

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