Fixed flags for ARM native debug build.
Also fixed indentation style to all-tabs.
This commit is contained in:
parent
b4f934b808
commit
2758756caa
@ -65,9 +65,11 @@ macro(set_flags)
|
|||||||
elseif(APPLE)
|
elseif(APPLE)
|
||||||
|
|
||||||
if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
|
if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
|
||||||
execute_process(COMMAND ${CMAKE_C_COMPILER} -dumpversion
|
execute_process(
|
||||||
OUTPUT_VARIABLE GCC_VERSION)
|
COMMAND ${CMAKE_C_COMPILER} -dumpversion
|
||||||
endif()
|
OUTPUT_VARIABLE GCC_VERSION
|
||||||
|
)
|
||||||
|
endif()
|
||||||
|
|
||||||
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
|
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_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -std=c++11")
|
||||||
@ -90,12 +92,14 @@ macro(set_flags)
|
|||||||
endif()
|
endif()
|
||||||
|
|
||||||
if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
|
if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
|
||||||
execute_process(COMMAND ${CMAKE_C_COMPILER} -dumpversion
|
execute_process(
|
||||||
OUTPUT_VARIABLE GCC_VERSION)
|
COMMAND ${CMAKE_C_COMPILER} -dumpversion
|
||||||
endif()
|
OUTPUT_VARIABLE GCC_VERSION
|
||||||
|
)
|
||||||
|
endif()
|
||||||
|
|
||||||
if("${CMAKE_SYSTEM_PROCESSOR}" MATCHES "arm")
|
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()
|
endif()
|
||||||
|
|
||||||
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
|
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
|
||||||
@ -122,8 +126,8 @@ macro(set_flags)
|
|||||||
endif()
|
endif()
|
||||||
|
|
||||||
if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
|
if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
|
||||||
get_clang_version()
|
get_clang_version()
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
|
|
||||||
# Use static CRT in MSVC builds:
|
# Use static CRT in MSVC builds:
|
||||||
|
Loading…
Reference in New Issue
Block a user