Skip to content

Commit 21c3c63

Browse files
authored
Refine database target verbosity
1 parent f3878fe commit 21c3c63

2 files changed

Lines changed: 9 additions & 4 deletions

File tree

pkg/maker/superlists.go

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -47,19 +47,23 @@ func (m *Maker) CreateSuperCMakeLists() error {
4747
contextOutputs += ")"
4848
}
4949

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

57-
var verbosity, logConfigure string
58+
var verbosity, logConfigure, stepLog string
5859
if m.Options.Debug || m.Options.Verbose {
5960
verbosity = " --verbose"
6061
} else {
6162
logConfigure = "\n LOG_CONFIGURE ON"
6263
logConfigure += "\n LOG_OUTPUT_ON_FAILURE ON"
64+
if !west {
65+
stepLog = "\n LOG TRUE"
66+
}
6367
}
6468

6569
// Write content
@@ -133,8 +137,8 @@ foreach(INDEX RANGE ${CONTEXTS_LENGTH})
133137
134138
# Database generation step
135139
ExternalProject_Add_Step(${CONTEXT} database
136-
COMMAND ${CMAKE_COMMAND} --build <BINARY_DIR> --target database` + verbosity + `
137-
ALWAYS TRUE
140+
COMMAND ${CMAKE_COMMAND} --build <BINARY_DIR> --target database` + verbosity + excludeFromMain + `
141+
ALWAYS TRUE` + stepLog + `
138142
USES_TERMINAL ON
139143
DEPENDEES configure
140144
)

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,7 @@ foreach(INDEX RANGE ${CONTEXTS_LENGTH})
9191
# Database generation step
9292
ExternalProject_Add_Step(${CONTEXT} database
9393
COMMAND ${CMAKE_COMMAND} --build <BINARY_DIR> --target database --verbose
94+
EXCLUDE_FROM_MAIN TRUE
9495
ALWAYS TRUE
9596
USES_TERMINAL ON
9697
DEPENDEES configure

0 commit comments

Comments
 (0)