summaryrefslogtreecommitdiffstats
path: root/CMakeLists.txt
diff options
context:
space:
mode:
authorpeterbell10 <peterbell10@live.co.uk>2017-08-22 21:56:32 +0200
committerLukas Pioch <lukas@zgow.de>2017-08-24 14:03:42 +0200
commit7b3372ad384291d3994ae4626f15c7692d0c3094 (patch)
treea8734e12e32ca2ec300e5d88fa22f54b63071e0b /CMakeLists.txt
parentMinor changes (#3909) (diff)
downloadcuberite-7b3372ad384291d3994ae4626f15c7692d0c3094.tar
cuberite-7b3372ad384291d3994ae4626f15c7692d0c3094.tar.gz
cuberite-7b3372ad384291d3994ae4626f15c7692d0c3094.tar.bz2
cuberite-7b3372ad384291d3994ae4626f15c7692d0c3094.tar.lz
cuberite-7b3372ad384291d3994ae4626f15c7692d0c3094.tar.xz
cuberite-7b3372ad384291d3994ae4626f15c7692d0c3094.tar.zst
cuberite-7b3372ad384291d3994ae4626f15c7692d0c3094.zip
Diffstat (limited to 'CMakeLists.txt')
-rw-r--r--CMakeLists.txt6
1 files changed, 6 insertions, 0 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 124169ddd..1b92ca8e8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -277,6 +277,12 @@ endif()
# (PolarSSL also has test and example programs in their CMakeLists.txt, we don't want those)
include(lib/polarssl.cmake EXCLUDE_FROM_ALL)
+if(NOT MSVC AND "${CMAKE_SYSTEM_PROCESSOR}" MATCHES "arm")
+ # mbed TLS uses the frame pointer's register in inline assembly:
+ # https://tls.mbed.org/kb/development/arm-thumb-error-r7-cannot-be-used-in-asm-here
+ target_compile_options(mbedtls PUBLIC -fomit-frame-pointer)
+endif()
+
set_exe_flags()
add_subdirectory(src)