From ffd633b3bb8306dc6e04fe4a6d47cc7775d40f6c Mon Sep 17 00:00:00 2001 From: xantares Date: Wed, 23 Oct 2013 20:22:20 +0200 Subject: [PATCH] fix use of CMAKE_SYSTEM_PROCESSOR --- CMakeLists.txt | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index b86cc634..6bb82497 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -368,14 +368,18 @@ if(MINGW) " --target=${rc_target} -i -o ") 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")