[Bf-blender-cvs] [107bbee] master: Use regex for cmake config parsing
Campbell Barton
noreply at git.blender.org
Mon Jul 13 12:11:16 CEST 2015
Commit: 107bbee4c763c95ea5d07a3b2f08bfe3b6adb24c
Author: Campbell Barton
Date: Mon Jul 13 20:03:15 2015 +1000
Branches: master
https://developer.blender.org/rB107bbee4c763c95ea5d07a3b2f08bfe3b6adb24c
Use regex for cmake config parsing
===================================================================
M build_files/cmake/project_source_info.py
===================================================================
diff --git a/build_files/cmake/project_source_info.py b/build_files/cmake/project_source_info.py
index b28c820..45d732c 100644
--- a/build_files/cmake/project_source_info.py
+++ b/build_files/cmake/project_source_info.py
@@ -59,14 +59,21 @@ def is_c_any(filename):
CMAKE_DIR = "."
-def cmake_cache_var(var):
- cache_file = open(join(CMAKE_DIR, "CMakeCache.txt"))
- lines = [l_strip for l in cache_file for l_strip in (l.strip(),) if l_strip if not l_strip.startswith("//") if not l_strip.startswith("#")]
- cache_file.close()
+def cmake_cache_var_iter():
+ import re
+ re_cache = re.compile(r'([A-Za-z0-9_\-]+)?:?([A-Za-z0-9_\-]+)?=(.*)$')
+ with open(join(CMAKE_DIR, "CMakeCache.txt"), 'r', encoding='utf-8') as cache_file:
+ for l in cache_file:
+ match = re_cache.match(l.strip())
+ if match is not None:
+ var, type_, val = match.groups()
+ yield (var, type_ or "", val)
+
- for l in lines:
- if l.split(":")[0] == var:
- return l.split("=", 1)[-1]
+def cmake_cache_var(var):
+ for var_iter, type_iter, value_iter in cmake_cache_var_iter():
+ if var == var_iter:
+ return value_iter
return None
More information about the Bf-blender-cvs
mailing list