alex/esp-idf
alex/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2024-10-05 20:47:46 -04:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge branch 'bugfix/idf_py_reconfigure_for_ccache_flag' into 'master'

Browse Source 
idf.py: Run reconfigure on ccache option change.make --no-ccache default

See merge request idf/esp-idf!5429
This commit is contained in:
Ivan Grokhotkov 2019-07-03 16:51:12 +08:00
commit 47da3d3334
1 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
tools/idf.py
View File

@ -222,6 +222,9 @@ def _ensure_build_directory(args, always_run_cmake=False):
os.makedirs(build_dir)
cache_path = os.path.join(build_dir, "CMakeCache.txt")
args.define_cache_entry = list(args.define_cache_entry)
args.define_cache_entry.append("CCACHE_ENABLE=%d" % args.ccache)
if always_run_cmake or _new_cmakecache_entries(cache_path, args.define_cache_entry):
if args.generator is None:
args.generator = detect_cmake_generator()
@ -235,8 +238,7 @@ def _ensure_build_directory(args, always_run_cmake=False):
]
if not args.no_warnings:
cmake_args += ["--warn-uninitialized"]
if args.ccache:
cmake_args += ["-DCCACHE_ENABLE=1"]
if args.define_cache_entry:
cmake_args += ["-D" + d for d in args.define_cache_entry]
cmake_args += [project_dir]
@ -960,19 +962,11 @@ def init_cli():
"default": False,
},
{
"names": ["--ccache"],
"help": "Use ccache in build",
"names": ["--ccache/--no-ccache"],
"help": "Use ccache in build. Disabled by default.",
"is_flag": True,
"default": False,
},
{
# This is unused/ignored argument, as ccache use was originally opt-out.
# Use of ccache has been made opt-in using --cache arg.
"names": ["--no-ccache"],
"default": True,
"is_flag": True,
"hidden": True,
},
{
"names": ["-G", "--generator"],
"help": "CMake generator.",