Merge branch 'bugfix/cmake_generators' into 'master'

tools: Force the order of cmake generators

Closes IDF-1444

See merge request espressif/esp-idf!7836
This commit is contained in:
Ivan Grokhotkov 2020-03-03 18:33:30 +08:00
commit 39aad6e9f7

View file

@ -1,3 +1,4 @@
import collections
import multiprocessing
import os
import platform
@ -16,23 +17,23 @@ else:
MAKE_CMD = "make"
MAKE_GENERATOR = "Unix Makefiles"
GENERATORS = {
GENERATORS = collections.OrderedDict([
# - command: build command line
# - version: version command line
# - dry_run: command to run in dry run mode
# - verbose_flag: verbose flag
"Ninja": {
("Ninja", {
"command": ["ninja"],
"version": ["ninja", "--version"],
"dry_run": ["ninja", "-n"],
"verbose_flag": "-v"
},
MAKE_GENERATOR: {
}),
(MAKE_GENERATOR, {
"command": [MAKE_CMD, "-j", str(multiprocessing.cpu_count() + 2)],
"version": [MAKE_CMD, "--version"],
"dry_run": [MAKE_CMD, "-n"],
"verbose_flag": "VERBOSE=1",
}
}
})
])
SUPPORTED_TARGETS = ["esp32", "esp32s2"]