@@ -20,14 +20,17 @@ const CMAKE_MIN_REQUIRED = "3.27"
2020
2121func (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 += "\n set(" + contextOutputsName + "\n "
3336
@@ -78,6 +81,9 @@ set(CONTEXTS
7881list(LENGTH CONTEXTS CONTEXTS_LENGTH)
7982math(EXPR CONTEXTS_LENGTH "${CONTEXTS_LENGTH}-1")
8083
84+ set(COMPILERS
85+ ` + compilers + `)
86+
8187set(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 + `
0 commit comments