diff --git a/utils/cmake/toolchains/ARM_GCC/compiler-flags.cmake b/utils/cmake/toolchains/ARM_GCC/compiler-flags.cmake index 16aacaa8..1b7646b7 100644 --- a/utils/cmake/toolchains/ARM_GCC/compiler-flags.cmake +++ b/utils/cmake/toolchains/ARM_GCC/compiler-flags.cmake @@ -19,31 +19,31 @@ set(CMAKE_DEPFILE_FLAGS_CXX "-MMD -MT -MF ") set(CMAKE_C_OUTPUT_EXTENSION ".o") set(CMAKE_DEPFILE_FLAGS_C "-MMD -MT -MF ") -set(CMAKE_C_FLAGS_DEBUG_INIT "-g -gdwarf-3") -set(CMAKE_C_FLAGS_MINSIZEREL_INIT "-Os -DNDEBUG") -set(CMAKE_C_FLAGS_RELEASE_INIT "-Os -DNDEBUG") -set(CMAKE_C_FLAGS_RELWITHDEBINFO_INIT "-Os -g -gdwarf-3 -DNDEBUG") +set(CMAKE_C_FLAGS_DEBUG "-g -gdwarf-4") +set(CMAKE_C_FLAGS_MINSIZEREL "-Os -DNDEBUG") +set(CMAKE_C_FLAGS_RELEASE "-Os -DNDEBUG") +set(CMAKE_C_FLAGS_RELWITHDEBINFO "-Os -g -gdwarf-4 -DNDEBUG") set(CMAKE_INCLUDE_SYSTEM_FLAG_C "-isystem ") -set(CMAKE_ASM_FLAGS_DEBUG_INIT "-g -gdwarf-3") -set(CMAKE_ASM_FLAGS_MINSIZEREL_INIT "-Os -DNDEBUG") -set(CMAKE_ASM_FLAGS_RELEASE_INIT "-Os -DNDEBUG") -set(CMAKE_ASM_FLAGS_RELWITHDEBINFO_INIT "-Os -g -gdwarf-3 -DNDEBUG") +set(CMAKE_ASM_FLAGS_DEBUG "-g -gdwarf-4") +set(CMAKE_ASM_FLAGS_MINSIZEREL "-Os -DNDEBUG") +set(CMAKE_ASM_FLAGS_RELEASE "-Os -DNDEBUG") +set(CMAKE_ASM_FLAGS_RELWITHDEBINFO "-Os -g -gdwarf-4 -DNDEBUG") set(CMAKE_INCLUDE_SYSTEM_FLAG_ASM "-isystem ") set(CMAKE_CXX_CREATE_STATIC_LIBRARY " -cr ") set(CMAKE_CXX_LINK_EXECUTABLE " -Wl,-Map,.map -Wl,--start-group -lnosys -lstdc++ -lsupc++ -lm -lc -lgcc -lstdc++ -lsupc++ -lm -lc -lgcc -Wl,--end-group --specs=nano.specs -o ") -set(CMAKE_CXX_FLAGS_DEBUG_INIT "-g -gdwarf-3") -set(CMAKE_CXX_FLAGS_MINSIZEREL_INIT "-Os -DNDEBUG") -set(CMAKE_CXX_FLAGS_RELEASE_INIT "-Os -DNDEBUG") -set(CMAKE_CXX_FLAGS_RELWITHDEBINFO_INIT "-Os -g -gdwarf-3 -DNDEBUG") +set(CMAKE_CXX_FLAGS_DEBUG "-g -gdwarf-4") +set(CMAKE_CXX_FLAGS_MINSIZEREL "-Os -DNDEBUG") +set(CMAKE_CXX_FLAGS_RELEASE "-Os -DNDEBUG") +set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-Os -g -gdwarf-4 -DNDEBUG") set(CMAKE_INCLUDE_SYSTEM_FLAG_CXX "-isystem ") if (CMAKE_C_COMPILER_VERSION VERSION_GREATER "7.1.0" OR CMAKE_C_COMPILER_VERSION VERSION_EQUAL "7.1.0") message("${BoldRed}Supressing -Wexpansion-to-defined.${ColourReset}") set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-expansion-to-defined") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-expansion-to-defined") -endif () \ No newline at end of file +endif () diff --git a/utils/cmake/toolchains/AVR_GCC/compiler-flags.cmake b/utils/cmake/toolchains/AVR_GCC/compiler-flags.cmake index c6dcfc7a..53887a71 100644 --- a/utils/cmake/toolchains/AVR_GCC/compiler-flags.cmake +++ b/utils/cmake/toolchains/AVR_GCC/compiler-flags.cmake @@ -1,3 +1,6 @@ +# This file is using CMAKE__FLAGS__INIT introduced in 3.11 +cmake_minimum_required(VERSION 3.11) + set(EXPLICIT_INCLUDES "") if((CMAKE_VERSION VERSION_GREATER "3.4.0") OR (CMAKE_VERSION VERSION_EQUAL "3.4.0")) # from CMake 3.4 are separate to in the diff --git a/utils/cmake/toolchains/XTENSA_GCC/compiler-flags.cmake b/utils/cmake/toolchains/XTENSA_GCC/compiler-flags.cmake index e0f7e2da..4c14994a 100644 --- a/utils/cmake/toolchains/XTENSA_GCC/compiler-flags.cmake +++ b/utils/cmake/toolchains/XTENSA_GCC/compiler-flags.cmake @@ -1,3 +1,6 @@ +# This file is using CMAKE__FLAGS__INIT introduced in 3.11 +cmake_minimum_required(VERSION 3.11) + set(EXPLICIT_INCLUDES "") if((CMAKE_VERSION VERSION_GREATER "3.4.0") OR (CMAKE_VERSION VERSION_EQUAL "3.4.0")) # from CMake 3.4 are separate to in the