Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 8 additions & 4 deletions pkg/maker/superlists.go
Original file line number Diff line number Diff line change
Expand Up @@ -47,19 +47,23 @@ func (m *Maker) CreateSuperCMakeLists() error {
contextOutputs += ")"
}

var westContexts, westContextCheck, westTarget string
var westContexts, westContextCheck, westTarget, excludeFromMain string
if west {
westContexts = "\nset(WEST_CONTEXTS\n" + westContextFlags + ")\n"
westContextCheck = "\n list(GET WEST_CONTEXTS ${INDEX} WEST_CONTEXT)\n if(WEST_CONTEXT)\n set(WEST_TARGET \"--target west\")\n endif()"
westTarget = " ${WEST_TARGET}"
excludeFromMain = "\n EXCLUDE_FROM_MAIN TRUE"
}

var verbosity, logConfigure string
var verbosity, logConfigure, stepLog string
if m.Options.Debug || m.Options.Verbose {
verbosity = " --verbose"
} else {
logConfigure = "\n LOG_CONFIGURE ON"
logConfigure += "\n LOG_OUTPUT_ON_FAILURE ON"
if !west {
stepLog = "\n LOG TRUE"
}
}

// Write content
Expand Down Expand Up @@ -133,8 +137,8 @@ foreach(INDEX RANGE ${CONTEXTS_LENGTH})

# Database generation step
ExternalProject_Add_Step(${CONTEXT} database
COMMAND ${CMAKE_COMMAND} --build <BINARY_DIR> --target database` + verbosity + `
ALWAYS TRUE
COMMAND ${CMAKE_COMMAND} --build <BINARY_DIR> --target database` + verbosity + excludeFromMain + `
ALWAYS TRUE` + stepLog + `
USES_TERMINAL ON
DEPENDEES configure
)
Expand Down
1 change: 1 addition & 0 deletions test/data/solutions/west/ref/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,7 @@ foreach(INDEX RANGE ${CONTEXTS_LENGTH})
# Database generation step
ExternalProject_Add_Step(${CONTEXT} database
COMMAND ${CMAKE_COMMAND} --build <BINARY_DIR> --target database --verbose
EXCLUDE_FROM_MAIN TRUE
ALWAYS TRUE
USES_TERMINAL ON
DEPENDEES configure
Expand Down