From 0f191c3366684143ea12a141d06751e25cd959b2 Mon Sep 17 00:00:00 2001 From: Roland Dobai Date: Mon, 2 Mar 2020 16:07:49 +0100 Subject: [PATCH] tools: Force the order of cmake generators --- tools/idf_py_actions/constants.py | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/tools/idf_py_actions/constants.py b/tools/idf_py_actions/constants.py index a7e81a2b2..17e581d50 100644 --- a/tools/idf_py_actions/constants.py +++ b/tools/idf_py_actions/constants.py @@ -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", "esp32s2beta"]