diff options
author | Campbell Barton <ideasman42@gmail.com> | 2017-08-23 09:10:45 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2017-08-23 09:10:45 +0300 |
commit | 58a4c767a14b60b903fbe5c5e7e960c57212faeb (patch) | |
tree | 8483aebad87ecc50cdeb8f76e861c755efb2cbd7 /build_files | |
parent | 9cfb72ff81a36c26f4b611ec733432968f15a2de (diff) | |
parent | b8d77c44f112cae1e98308ff33ce055ea4fb46ff (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'build_files')
-rwxr-xr-x | build_files/cmake/cmake_consistency_check.py | 4 | ||||
-rwxr-xr-x | build_files/cmake/project_info.py | 6 |
2 files changed, 3 insertions, 7 deletions
diff --git a/build_files/cmake/cmake_consistency_check.py b/build_files/cmake/cmake_consistency_check.py index 3d06790758a..443657532de 100755 --- a/build_files/cmake/cmake_consistency_check.py +++ b/build_files/cmake/cmake_consistency_check.py @@ -61,10 +61,8 @@ def replace_line(f, i, text, keep_indent=True): def source_list(path, filename_check=None): for dirpath, dirnames, filenames in os.walk(path): - # skip '.git' - if dirpath.startswith("."): - continue + dirnames[:] = [d for d in dirnames if not d.startswith(".")] for filename in filenames: if filename_check is None or filename_check(filename): diff --git a/build_files/cmake/project_info.py b/build_files/cmake/project_info.py index 3ac4c4c9480..9b0905da030 100755 --- a/build_files/cmake/project_info.py +++ b/build_files/cmake/project_info.py @@ -84,10 +84,8 @@ def init(cmake_path): def source_list(path, filename_check=None): for dirpath, dirnames, filenames in os.walk(path): - - # skip '.svn' - if dirpath.startswith("."): - continue + # skip '.git' + dirnames[:] = [d for d in dirnames if not d.startswith(".")] for filename in filenames: filepath = join(dirpath, filename) |