monero-project/monero
monero-project/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2024-12-23 12:09:54 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fixed ARM arch test to prevent breaking on short arch strings

Browse source
This commit is contained in:
Riccardo Spagni 2015-07-16 12:46:38 +02:00
parent a4254a48f1
commit 54c785d0bb
No known key found for this signature in database
GPG key ID: 55432DF31CCD4FCD
1 changed files with 17 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
CMakeLists.txt
View file

@ -46,20 +46,25 @@ function (die msg)
endfunction () endfunction ()
if (NOT ${ARCH} STREQUAL "") if (NOT ${ARCH} STREQUAL "")
string(SUBSTRING ${ARCH} 0 5 ARM_TEST) string(SUBSTRING ${ARCH} 0 3 IS_ARM)
string(TOLOWER ${ARM_TEST} ARM_TEST) string(TOLOWER ${IS_ARM} IS_ARM)
if (${IS_ARM} STREQUAL "arm")
string(SUBSTRING ${ARCH} 0 5 ARM_TEST)
string(TOLOWER ${ARM_TEST} ARM_TEST)
if (${ARM_TEST} STREQUAL "armv6") if (${ARM_TEST} STREQUAL "armv6")
set(ARM6 1) set(ARM6 1)
else() else()
set(ARM6 0) set(ARM6 0)
endif() endif()
if (${ARM_TEST} STREQUAL "armv7") if (${ARM_TEST} STREQUAL "armv7")
set(ARM7 1) set(ARM7 1)
else() else()
set(ARM7 0) set(ARM7 0)
endif() endif()
endif()
endif() endif()
if(WIN32 OR ARM7 OR ARM6) if(WIN32 OR ARM7 OR ARM6)