sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

patch [#33969] fix for [#33968] Blenders Custom Project File Generator for QtCreator fails

Browse Source 
from Philipp Oeser (lichtwerk)
This commit is contained in:
Campbell Barton 2013-01-24 08:59:48 +00:00
parent 6510367c38
commit a790c8c6f9
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build_files/cmake/project_info.py
View File

@ -141,7 +141,7 @@ def cmake_advanced_info():
if sys.platform == "win32": if sys.platform == "win32":
cmd = 'cmake "%s" -G"Eclipse CDT4 - MinGW Makefiles"' % CMAKE_DIR cmd = 'cmake "%s" -G"Eclipse CDT4 - MinGW Makefiles"' % CMAKE_DIR
else: else:
if make_exe_basename.startswith("make"): if make_exe_basename.startswith("make") or make_exe_basename.startswith("gmake"):
cmd = 'cmake "%s" -G"Eclipse CDT4 - Unix Makefiles"' % CMAKE_DIR cmd = 'cmake "%s" -G"Eclipse CDT4 - Unix Makefiles"' % CMAKE_DIR
elif make_exe_basename.startswith("ninja"): elif make_exe_basename.startswith("ninja"):
cmd = 'cmake "%s" -G"Eclipse CDT4 - Ninja"' % CMAKE_DIR cmd = 'cmake "%s" -G"Eclipse CDT4 - Ninja"' % CMAKE_DIR

2
build_files/cmake/project_source_info.py
View File

@ -86,7 +86,7 @@ def makefile_log():
make_exe = cmake_cache_var("CMAKE_MAKE_PROGRAM") make_exe = cmake_cache_var("CMAKE_MAKE_PROGRAM")
make_exe_basename = os.path.basename(make_exe) make_exe_basename = os.path.basename(make_exe)
if make_exe_basename.startswith("make"): if make_exe_basename.startswith("make") or make_exe_basename.startswith("gmake"):
print("running 'make' with --dry-run ...") print("running 'make' with --dry-run ...")
process = subprocess.Popen([make_exe, "--always-make", "--dry-run", "--keep-going", "VERBOSE=1"], process = subprocess.Popen([make_exe, "--always-make", "--dry-run", "--keep-going", "VERBOSE=1"],
stdout=subprocess.PIPE, stdout=subprocess.PIPE,