summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMattes D <github@xoft.cz>2015-09-25 09:58:21 +0200
committerMattes D <github@xoft.cz>2015-09-25 09:58:21 +0200
commitb6e28ad422321d9383001b429a415f625c81cf41 (patch)
treed2f2e23e50f705a0e4c3db524203612f444c8488
parentfixed cast (diff)
parentFixed flags for ARM native debug build. (diff)
downloadcuberite-b6e28ad422321d9383001b429a415f625c81cf41.tar
cuberite-b6e28ad422321d9383001b429a415f625c81cf41.tar.gz
cuberite-b6e28ad422321d9383001b429a415f625c81cf41.tar.bz2
cuberite-b6e28ad422321d9383001b429a415f625c81cf41.tar.lz
cuberite-b6e28ad422321d9383001b429a415f625c81cf41.tar.xz
cuberite-b6e28ad422321d9383001b429a415f625c81cf41.tar.zst
cuberite-b6e28ad422321d9383001b429a415f625c81cf41.zip
-rw-r--r--SetFlags.cmake22
1 files changed, 13 insertions, 9 deletions
diff --git a/SetFlags.cmake b/SetFlags.cmake
index c99a6355b..076fba1f7 100644
--- a/SetFlags.cmake
+++ b/SetFlags.cmake
@@ -65,9 +65,11 @@ macro(set_flags)
elseif(APPLE)
if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
- execute_process(COMMAND ${CMAKE_C_COMPILER} -dumpversion
- OUTPUT_VARIABLE GCC_VERSION)
- endif()
+ execute_process(
+ COMMAND ${CMAKE_C_COMPILER} -dumpversion
+ OUTPUT_VARIABLE GCC_VERSION
+ )
+ endif()
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -std=c++11")
@@ -90,12 +92,14 @@ macro(set_flags)
endif()
if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
- execute_process(COMMAND ${CMAKE_C_COMPILER} -dumpversion
- OUTPUT_VARIABLE GCC_VERSION)
- endif()
+ execute_process(
+ COMMAND ${CMAKE_C_COMPILER} -dumpversion
+ OUTPUT_VARIABLE GCC_VERSION
+ )
+ endif()
if("${CMAKE_SYSTEM_PROCESSOR}" MATCHES "arm")
- set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG}" "-fomit-frame-pointer")
+ set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -fomit-frame-pointer")
endif()
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
@@ -122,8 +126,8 @@ macro(set_flags)
endif()
if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
- get_clang_version()
- endif()
+ get_clang_version()
+ endif()
# Use static CRT in MSVC builds: