Skip to content

Commit 75bd199

Browse files
authored
Print used compiler name and version for each CMake build target
1 parent cc91dc3 commit 75bd199

File tree

5 files changed

+37
-1
lines changed

5 files changed

+37
-1
lines changed

pkg/maker/superlists.go

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,17 @@ const CMAKE_MIN_REQUIRED = "3.27"
2020

2121
func (m *Maker) CreateSuperCMakeLists() error {
2222
// Iterate over cbuilds
23-
var contexts, dirs, westContextFlags, contextOutputs string
23+
var contexts, dirs, westContextFlags, contextOutputs, compilers string
2424
west := false
2525
for i, cbuild := range m.Cbuilds {
2626
contexts = contexts + " \"" + strings.ReplaceAll(cbuild.BuildDescType.Context, " ", "_") + "\"\n"
2727
dirs = dirs + " \"${CMAKE_CURRENT_SOURCE_DIR}/" + cbuild.BuildDescType.Context + "\"\n"
2828
west = west || (cbuild.BuildDescType.West.AppPath != "")
2929
westContextFlags = westContextFlags + " \"" + strconv.FormatBool(west) + "\"\n"
3030

31+
compilers += " \"" + m.RegisteredToolchains[m.SelectedToolchainVersion[i]].Name +
32+
" V" + m.SelectedToolchainVersion[i].String() + "\"\n"
33+
3134
var contextOutputsName = "OUTPUTS_" + strconv.Itoa(i+1)
3235
contextOutputs += "\nset(" + contextOutputsName + "\n"
3336

@@ -78,6 +81,9 @@ set(CONTEXTS
7881
list(LENGTH CONTEXTS CONTEXTS_LENGTH)
7982
math(EXPR CONTEXTS_LENGTH "${CONTEXTS_LENGTH}-1")
8083
84+
set(COMPILERS
85+
` + compilers + `)
86+
8187
set(DIRS
8288
` + dirs + `)
8389
` + westContexts + contextOutputs + `
@@ -96,6 +102,7 @@ foreach(INDEX RANGE ${CONTEXTS_LENGTH})
96102
97103
math(EXPR N "${INDEX}+1")
98104
list(GET CONTEXTS ${INDEX} CONTEXT)
105+
list(GET COMPILERS ${INDEX} COMPILER)
99106
list(GET DIRS ${INDEX} DIR)` + westContextCheck + `
100107
101108
# Create external project, set configure and build steps
@@ -107,6 +114,7 @@ foreach(INDEX RANGE ${CONTEXTS_LENGTH})
107114
TEST_COMMAND ""
108115
CONFIGURE_COMMAND ${CMAKE_COMMAND} -G Ninja -S <SOURCE_DIR> -B <BINARY_DIR> ${ARGS}
109116
BUILD_COMMAND ${CMAKE_COMMAND} -E cmake_echo_color --blue --bold "Building CMake target '${CONTEXT}'"
117+
COMMAND ${CMAKE_COMMAND} -E echo "Using compiler: ${COMPILER}"
110118
COMMAND ${CMAKE_COMMAND} --build <BINARY_DIR>` + westTarget + verbosity + `
111119
BUILD_ALWAYS TRUE
112120
BUILD_BYPRODUCTS ${OUTPUTS_${N}}` + logConfigure + `

test/data/solutions/blanks/ref/CMakeLists.txt

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,10 @@ set(CONTEXTS
1616
list(LENGTH CONTEXTS CONTEXTS_LENGTH)
1717
math(EXPR CONTEXTS_LENGTH "${CONTEXTS_LENGTH}-1")
1818

19+
set(COMPILERS
20+
"AC6 V6.19.0"
21+
)
22+
1923
set(DIRS
2024
"${CMAKE_CURRENT_SOURCE_DIR}/project X.AC6 X+ARMCM0 X"
2125
)
@@ -38,6 +42,7 @@ foreach(INDEX RANGE ${CONTEXTS_LENGTH})
3842

3943
math(EXPR N "${INDEX}+1")
4044
list(GET CONTEXTS ${INDEX} CONTEXT)
45+
list(GET COMPILERS ${INDEX} COMPILER)
4146
list(GET DIRS ${INDEX} DIR)
4247

4348
# Create external project, set configure and build steps
@@ -49,6 +54,7 @@ foreach(INDEX RANGE ${CONTEXTS_LENGTH})
4954
TEST_COMMAND ""
5055
CONFIGURE_COMMAND ${CMAKE_COMMAND} -G Ninja -S <SOURCE_DIR> -B <BINARY_DIR> ${ARGS}
5156
BUILD_COMMAND ${CMAKE_COMMAND} -E cmake_echo_color --blue --bold "Building CMake target '${CONTEXT}'"
57+
COMMAND ${CMAKE_COMMAND} -E echo "Using compiler: ${COMPILER}"
5258
COMMAND ${CMAKE_COMMAND} --build <BINARY_DIR> --verbose
5359
BUILD_ALWAYS TRUE
5460
BUILD_BYPRODUCTS ${OUTPUTS_${N}}

test/data/solutions/executes/ref/CMakeLists.txt

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,10 @@ set(CONTEXTS
1616
list(LENGTH CONTEXTS CONTEXTS_LENGTH)
1717
math(EXPR CONTEXTS_LENGTH "${CONTEXTS_LENGTH}-1")
1818

19+
set(COMPILERS
20+
"AC6 V6.19.0"
21+
)
22+
1923
set(DIRS
2024
"${CMAKE_CURRENT_SOURCE_DIR}/project.Release+ARMCM0"
2125
)
@@ -38,6 +42,7 @@ foreach(INDEX RANGE ${CONTEXTS_LENGTH})
3842

3943
math(EXPR N "${INDEX}+1")
4044
list(GET CONTEXTS ${INDEX} CONTEXT)
45+
list(GET COMPILERS ${INDEX} COMPILER)
4146
list(GET DIRS ${INDEX} DIR)
4247

4348
# Create external project, set configure and build steps
@@ -49,6 +54,7 @@ foreach(INDEX RANGE ${CONTEXTS_LENGTH})
4954
TEST_COMMAND ""
5055
CONFIGURE_COMMAND ${CMAKE_COMMAND} -G Ninja -S <SOURCE_DIR> -B <BINARY_DIR> ${ARGS}
5156
BUILD_COMMAND ${CMAKE_COMMAND} -E cmake_echo_color --blue --bold "Building CMake target '${CONTEXT}'"
57+
COMMAND ${CMAKE_COMMAND} -E echo "Using compiler: ${COMPILER}"
5258
COMMAND ${CMAKE_COMMAND} --build <BINARY_DIR> --verbose
5359
BUILD_ALWAYS TRUE
5460
BUILD_BYPRODUCTS ${OUTPUTS_${N}}

test/data/solutions/pre-include-oot/ref/CMakeLists.txt

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,13 @@ set(CONTEXTS
1919
list(LENGTH CONTEXTS CONTEXTS_LENGTH)
2020
math(EXPR CONTEXTS_LENGTH "${CONTEXTS_LENGTH}-1")
2121

22+
set(COMPILERS
23+
"AC6 V6.19.0"
24+
"CLANG V18.0.0"
25+
"GCC V12.3.0"
26+
"IAR V9.32.5"
27+
)
28+
2229
set(DIRS
2330
"${CMAKE_CURRENT_SOURCE_DIR}/project.AC6+ARMCM0"
2431
"${CMAKE_CURRENT_SOURCE_DIR}/project.CLANG+ARMCM0"
@@ -53,6 +60,7 @@ foreach(INDEX RANGE ${CONTEXTS_LENGTH})
5360

5461
math(EXPR N "${INDEX}+1")
5562
list(GET CONTEXTS ${INDEX} CONTEXT)
63+
list(GET COMPILERS ${INDEX} COMPILER)
5664
list(GET DIRS ${INDEX} DIR)
5765

5866
# Create external project, set configure and build steps
@@ -64,6 +72,7 @@ foreach(INDEX RANGE ${CONTEXTS_LENGTH})
6472
TEST_COMMAND ""
6573
CONFIGURE_COMMAND ${CMAKE_COMMAND} -G Ninja -S <SOURCE_DIR> -B <BINARY_DIR> ${ARGS}
6674
BUILD_COMMAND ${CMAKE_COMMAND} -E cmake_echo_color --blue --bold "Building CMake target '${CONTEXT}'"
75+
COMMAND ${CMAKE_COMMAND} -E echo "Using compiler: ${COMPILER}"
6776
COMMAND ${CMAKE_COMMAND} --build <BINARY_DIR> --verbose
6877
BUILD_ALWAYS TRUE
6978
BUILD_BYPRODUCTS ${OUTPUTS_${N}}

test/data/solutions/west/ref/CMakeLists.txt

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,11 @@ set(CONTEXTS
1717
list(LENGTH CONTEXTS CONTEXTS_LENGTH)
1818
math(EXPR CONTEXTS_LENGTH "${CONTEXTS_LENGTH}-1")
1919

20+
set(COMPILERS
21+
"AC6 V6.19.0"
22+
"AC6 V6.19.0"
23+
)
24+
2025
set(DIRS
2126
"${CMAKE_CURRENT_SOURCE_DIR}/core0.Debug+CM0"
2227
"${CMAKE_CURRENT_SOURCE_DIR}/core1.Debug+CM0"
@@ -50,6 +55,7 @@ foreach(INDEX RANGE ${CONTEXTS_LENGTH})
5055

5156
math(EXPR N "${INDEX}+1")
5257
list(GET CONTEXTS ${INDEX} CONTEXT)
58+
list(GET COMPILERS ${INDEX} COMPILER)
5359
list(GET DIRS ${INDEX} DIR)
5460
list(GET WEST_CONTEXTS ${INDEX} WEST_CONTEXT)
5561
if(WEST_CONTEXT)
@@ -65,6 +71,7 @@ foreach(INDEX RANGE ${CONTEXTS_LENGTH})
6571
TEST_COMMAND ""
6672
CONFIGURE_COMMAND ${CMAKE_COMMAND} -G Ninja -S <SOURCE_DIR> -B <BINARY_DIR> ${ARGS}
6773
BUILD_COMMAND ${CMAKE_COMMAND} -E cmake_echo_color --blue --bold "Building CMake target '${CONTEXT}'"
74+
COMMAND ${CMAKE_COMMAND} -E echo "Using compiler: ${COMPILER}"
6875
COMMAND ${CMAKE_COMMAND} --build <BINARY_DIR> ${WEST_TARGET} --verbose
6976
BUILD_ALWAYS TRUE
7077
BUILD_BYPRODUCTS ${OUTPUTS_${N}}

0 commit comments

Comments
 (0)