diff options
| author | peterbell10 <peterbell10@live.co.uk> | 2017-08-22 21:56:32 +0200 |
|---|---|---|
| committer | Lukas Pioch <lukas@zgow.de> | 2017-08-24 14:03:42 +0200 |
| commit | 7b3372ad384291d3994ae4626f15c7692d0c3094 (patch) | |
| tree | a8734e12e32ca2ec300e5d88fa22f54b63071e0b | |
| parent | Minor changes (#3909) (diff) | |
| download | cuberite-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 | |
| -rw-r--r-- | CMakeLists.txt | 6 | ||||
| -rw-r--r-- | SetFlags.cmake | 7 |
2 files changed, 6 insertions, 7 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) diff --git a/SetFlags.cmake b/SetFlags.cmake index e0eb05ef1..d072d1aad 100644 --- a/SetFlags.cmake +++ b/SetFlags.cmake @@ -107,13 +107,6 @@ macro(set_flags) ) endif() - if("${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 - set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -fomit-frame-pointer") - set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -fomit-frame-pointer") - endif() - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11") set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -std=c++11") set(CMAKE_CXX_FLAGS_COVERAGE "${CMAKE_CXX_FLAGS_COVERAGE} -std=c++11") |