diff options
author | Alexander Kutsan <akutsan@luxoft.com> | 2017-03-02 09:50:10 +0000 |
---|---|---|
committer | Jacob Keeler <jacob.keeler@livioradio.com> | 2017-05-16 10:07:18 -0400 |
commit | df3e4ee295b981100ff033655607679508404fcc (patch) | |
tree | 2df34c475485410d749675715e054f70b9da40ae | |
parent | 458fa67468b2c10a7f8eb18277a83eb90c2f8004 (diff) | |
download | sdl_core-df3e4ee295b981100ff033655607679508404fcc.tar.gz |
Fix detecting arhitecture on raspberry pi
Detect arhotecture depending on size of void
Related to #1329
-rw-r--r-- | tools/cmake/helpers/platform.cmake | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/tools/cmake/helpers/platform.cmake b/tools/cmake/helpers/platform.cmake index a377dfd042..023cd7e879 100644 --- a/tools/cmake/helpers/platform.cmake +++ b/tools/cmake/helpers/platform.cmake @@ -74,20 +74,16 @@ function(get_os OS) endfunction() function(get_arch ARCH) - if(ARCH_X86) + if( CMAKE_SIZEOF_VOID_P MATCHES 8 ) + # void ptr = 8 byte --> x86_64 + set(${ARCH} "x86_64" PARENT_SCOPE) + elseif( CMAKE_SIZEOF_VOID_P MATCHES 4 ) + # void ptr = 4 byte --> x86 set(${ARCH} "x86" PARENT_SCOPE) - elseif(ARCH_X64) - set(${ARCH} "x64" PARENT_SCOPE) else() - if(${CMAKE_SYSTEM_PROCESSOR} MATCHES "i386") - set(${ARCH} "x86" PARENT_SCOPE) - elseif(${CMAKE_SYSTEM_PROCESSOR} MATCHES "x86_64") - set(${ARCH} "x64" PARENT_SCOPE) - else() message(FATAL_ERROR "Unsupported architecture") - endif() - endif() -endfunction() + endif() +endfunction(get_arch ARCH) function(get_sdk SDK) if(SDK_QT) |