From b9e475cbf4b6cc24da95183309c358577cabe3ca Mon Sep 17 00:00:00 2001 From: Jared Boone Date: Fri, 23 Sep 2016 12:18:42 -0700 Subject: [PATCH] Silence CMakeForceCompiler deprecation warning for >=3.6. --- firmware/toolchain-arm-cortex-m.cmake | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/firmware/toolchain-arm-cortex-m.cmake b/firmware/toolchain-arm-cortex-m.cmake index 033fb1857..2304f6f88 100644 --- a/firmware/toolchain-arm-cortex-m.cmake +++ b/firmware/toolchain-arm-cortex-m.cmake @@ -23,10 +23,16 @@ set(CMAKE_SYSTEM_NAME Generic) set(CMAKE_SYSTEM_VERSION 1) set(CMAKE_SYSTEM_PROCESSOR arm) -include(CMakeForceCompiler) +if(CMAKE_VERSION VERSION_LESS 3.6) + include(CMakeForceCompiler) -CMAKE_FORCE_C_COMPILER(arm-none-eabi-gcc GNU) -CMAKE_FORCE_CXX_COMPILER(arm-none-eabi-g++ GNU) + CMAKE_FORCE_C_COMPILER(arm-none-eabi-gcc GNU) + CMAKE_FORCE_CXX_COMPILER(arm-none-eabi-g++ GNU) +else() + set(CMAKE_C_COMPILER arm-none-eabi-gcc) + set(CMAKE_CXX_COMPILER arm-none-eabi-g++) + set(CMAKE_TRY_COMPILE_TARGET_TYPE STATIC_LIBRARY) +endif() execute_process( COMMAND ${CMAKE_C_COMPILER} -print-file-name=libc.a