Skip to content

Commit 363e64d

Browse files
Remove usage of CMAKE_<LANG>_FLAGS_<CONFIG>_INIT CMake variables.
As they were introduced in CMake 3.11, and this project currently support 3.6+. The CMAKE_<LANG>_FLAGS_<CONFIG> are reset here instead of using _INIT, as we want these to be the starting values, overwritting any CMake defaults.
1 parent 5bfdee6 commit 363e64d

File tree

3 files changed

+14
-11
lines changed

3 files changed

+14
-11
lines changed

utils/cmake/toolchains/ARM_GCC/compiler-flags.cmake

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -31,33 +31,30 @@ set(CMAKE_DEPFILE_FLAGS_CXX "-MMD -MT <OBJECT> -MF <DEPFILE>")
3131
set(CMAKE_C_OUTPUT_EXTENSION ".o")
3232
set(CMAKE_DEPFILE_FLAGS_C "-MMD -MT <OBJECT> -MF <DEPFILE>")
3333

34-
set(CMAKE_C_FLAGS_RELWITHDEBINFO "-g ${DWARF_VERSION_FLAG}")
3534
set(CMAKE_C_FLAGS_DEBUG_INIT "-g ${DWARF_VERSION_FLAG}")
3635
set(CMAKE_C_FLAGS_MINSIZEREL_INIT "-Os -DNDEBUG")
3736
set(CMAKE_C_FLAGS_RELEASE_INIT "-Os -DNDEBUG")
38-
set(CMAKE_C_FLAGS_RELWITHDEBINFO_INIT "-Os -g ${DWARF_VERSION_FLAG} -DNDEBUG")
37+
set(CMAKE_C_FLAGS_RELWITHDEBINFO "-Os -DNDEBUG -g ${DWARF_VERSION_FLAG}")
3938
set(CMAKE_INCLUDE_SYSTEM_FLAG_C "-isystem ")
4039

41-
set(CMAKE_ASM_FLAGS_RELWITHDEBINFO "-g ${DWARF_VERSION_FLAG}")
42-
set(CMAKE_ASM_FLAGS_DEBUG_INIT "-g ${DWARF_VERSION_FLAG}")
40+
set(CMAKE_ASM_FLAGS_DEBUG "-g ${DWARF_VERSION_FLAG}")
4341
set(CMAKE_ASM_FLAGS_MINSIZEREL_INIT "-Os -DNDEBUG")
4442
set(CMAKE_ASM_FLAGS_RELEASE_INIT "-Os -DNDEBUG")
45-
set(CMAKE_ASM_FLAGS_RELWITHDEBINFO_INIT "-Os -g ${DWARF_VERSION_FLAG} -DNDEBUG")
43+
set(CMAKE_ASM_FLAGS_RELWITHDEBINFO "-Os -DNDEBUG -g ${DWARF_VERSION_FLAG}")
4644
set(CMAKE_INCLUDE_SYSTEM_FLAG_ASM "-isystem ")
4745

4846
set(CMAKE_CXX_CREATE_STATIC_LIBRARY "<CMAKE_AR> -cr <LINK_FLAGS> <TARGET> <OBJECTS>")
4947

5048
set(CMAKE_CXX_LINK_EXECUTABLE "<CMAKE_CXX_COMPILER> <CMAKE_CXX_LINK_FLAGS> <LINK_FLAGS> -Wl,-Map,<TARGET>.map -Wl,--start-group <OBJECTS> <LINK_LIBRARIES> -lnosys -lstdc++ -lsupc++ -lm -lc -lgcc -lstdc++ -lsupc++ -lm -lc -lgcc -Wl,--end-group --specs=nano.specs -o <TARGET>")
5149

52-
set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-g ${DWARF_VERSION_FLAG}")
53-
set(CMAKE_CXX_FLAGS_DEBUG_INIT "-g ${DWARF_VERSION_FLAG}")
54-
set(CMAKE_CXX_FLAGS_MINSIZEREL_INIT "-Os -DNDEBUG")
55-
set(CMAKE_CXX_FLAGS_RELEASE_INIT "-Os -DNDEBUG")
56-
set(CMAKE_CXX_FLAGS_RELWITHDEBINFO_INIT "-Os -g ${DWARF_VERSION_FLAG} -DNDEBUG")
50+
set(CMAKE_CXX_FLAGS_DEBUG "-g ${DWARF_VERSION_FLAG}")
51+
set(CMAKE_CXX_FLAGS_MINSIZEREL "-Os -DNDEBUG")
52+
set(CMAKE_CXX_FLAGS_RELEASE "-Os -DNDEBUG")
53+
set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-Os -DNDEBUG -g ${DWARF_VERSION_FLAG}")
5754
set(CMAKE_INCLUDE_SYSTEM_FLAG_CXX "-isystem ")
5855

5956
if (CMAKE_C_COMPILER_VERSION VERSION_GREATER "7.1.0" OR CMAKE_C_COMPILER_VERSION VERSION_EQUAL "7.1.0")
6057
message("${BoldRed}Supressing -Wexpansion-to-defined.${ColourReset}")
6158
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-expansion-to-defined")
6259
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-expansion-to-defined")
63-
endif ()
60+
endif ()

utils/cmake/toolchains/AVR_GCC/compiler-flags.cmake

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
# This file is using CMAKE_<LANG>_FLAGS_<CONFIG>_INIT introduced in 3.11
2+
cmake_minimum_required(VERSION 3.11)
3+
14
set(EXPLICIT_INCLUDES "")
25
if((CMAKE_VERSION VERSION_GREATER "3.4.0") OR (CMAKE_VERSION VERSION_EQUAL "3.4.0"))
36
# from CMake 3.4 <INCLUDES> are separate to <FLAGS> in the

utils/cmake/toolchains/XTENSA_GCC/compiler-flags.cmake

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
# This file is using CMAKE_<LANG>_FLAGS_<CONFIG>_INIT introduced in 3.11
2+
cmake_minimum_required(VERSION 3.11)
3+
14
set(EXPLICIT_INCLUDES "")
25
if((CMAKE_VERSION VERSION_GREATER "3.4.0") OR (CMAKE_VERSION VERSION_EQUAL "3.4.0"))
36
# from CMake 3.4 <INCLUDES> are separate to <FLAGS> in the

0 commit comments

Comments
 (0)