idf.py: Add check for new cmake cache values
@@ -150,6 +150,32 @@ def detect_cmake_generator():
raise FatalError("To use %s, either the 'ninja' or 'GNU make' build tool must be available in the PATH" % PROG)
+def _strip_quotes(value, regexp=re.compile(r"^\"(.*)\"$|^'(.*)'$|^(.*)$")):
+ """
+ Strip quotes like CMake does during parsing cache entries
+ """
+
+ return [x for x in regexp.match(value).groups() if x is not None][0].rstrip()
+
+
+def _new_cmakecache_entries(cache_path, new_cache_entries):
+ if not os.path.exists(cache_path):
+ return True
+
+ current_cache = parse_cmakecache(cache_path)
+
+ if new_cache_entries:
+ current_cache = parse_cmakecache(cache_path)
+
+ for entry in new_cache_entries:
+ key, value = entry.split("=", 1)
+ current_value = current_cache.get(key, None)
+ if current_value is None or _strip_quotes(value) != current_value:
+ return True
+
+ return False
+
+
def _ensure_build_directory(args, always_run_cmake=False):
"""Check the build directory exists and that cmake has been run there.
@@ -175,7 +201,8 @@ def _ensure_build_directory(args, always_run_cmake=False):
if not os.path.isdir(build_dir):
os.makedirs(build_dir)
cache_path = os.path.join(build_dir, "CMakeCache.txt")
- if not os.path.exists(cache_path) or always_run_cmake:
+
+ if always_run_cmake or _new_cmakecache_entries(cache_path, args.define_cache_entry):
if args.generator is None:
args.generator = detect_cmake_generator()
try:
@@ -230,7 +257,7 @@ def parse_cmakecache(path):
for line in f:
# cmake cache lines look like: CMAKE_CXX_FLAGS_DEBUG:STRING=-g
# groups are name, type, value
- m = re.match(r"^([^#/:=]+):([^:=]+)=(.+)\n$", line)
+ m = re.match(r"^([^#/:=]+):([^:=]+)=(.*)\n$", line)
if m:
result[m.group(1)] = m.group(3)
return result
