From 8a60c7dc7dd0c83c69a451efe1ab49e5db0cdb74 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Thu, 24 Jan 2013 09:36:22 +0000 Subject: fix for missing initialization of vert data in ccgDM_copyFinalVertArray --- build_files/cmake/project_info.py | 2 +- build_files/cmake/project_source_info.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'build_files') diff --git a/build_files/cmake/project_info.py b/build_files/cmake/project_info.py index ff123251195..73648be3f15 100755 --- a/build_files/cmake/project_info.py +++ b/build_files/cmake/project_info.py @@ -141,7 +141,7 @@ def cmake_advanced_info(): if sys.platform == "win32": cmd = 'cmake "%s" -G"Eclipse CDT4 - MinGW Makefiles"' % CMAKE_DIR else: - if make_exe_basename.startswith("make") or make_exe_basename.startswith("gmake"): + if make_exe_basename.startswith(("make", "gmake")): cmd = 'cmake "%s" -G"Eclipse CDT4 - Unix Makefiles"' % CMAKE_DIR elif make_exe_basename.startswith("ninja"): cmd = 'cmake "%s" -G"Eclipse CDT4 - Ninja"' % CMAKE_DIR diff --git a/build_files/cmake/project_source_info.py b/build_files/cmake/project_source_info.py index f2059b18ab4..90e240c35ef 100644 --- a/build_files/cmake/project_source_info.py +++ b/build_files/cmake/project_source_info.py @@ -86,7 +86,7 @@ def makefile_log(): make_exe = cmake_cache_var("CMAKE_MAKE_PROGRAM") make_exe_basename = os.path.basename(make_exe) - if make_exe_basename.startswith("make") or make_exe_basename.startswith("gmake"): + if make_exe_basename.startswith(("make", "gmake")): print("running 'make' with --dry-run ...") process = subprocess.Popen([make_exe, "--always-make", "--dry-run", "--keep-going", "VERBOSE=1"], stdout=subprocess.PIPE, -- cgit v1.2.3