[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [54070] trunk/blender/build_files/cmake: patch [#33969] fix for [#33968] Blenders Custom Project File Generator for QtCreator fails
Campbell Barton
ideasman42 at gmail.com
Thu Jan 24 09:59:53 CET 2013
Revision: 54070
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=54070
Author: campbellbarton
Date: 2013-01-24 08:59:48 +0000 (Thu, 24 Jan 2013)
Log Message:
-----------
patch [#33969] fix for [#33968] Blenders Custom Project File Generator for QtCreator fails
from Philipp Oeser (lichtwerk)
Modified Paths:
--------------
trunk/blender/build_files/cmake/project_info.py
trunk/blender/build_files/cmake/project_source_info.py
Modified: trunk/blender/build_files/cmake/project_info.py
===================================================================
--- trunk/blender/build_files/cmake/project_info.py 2013-01-24 08:49:48 UTC (rev 54069)
+++ trunk/blender/build_files/cmake/project_info.py 2013-01-24 08:59:48 UTC (rev 54070)
@@ -141,7 +141,7 @@
if sys.platform == "win32":
cmd = 'cmake "%s" -G"Eclipse CDT4 - MinGW Makefiles"' % CMAKE_DIR
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
elif make_exe_basename.startswith("ninja"):
cmd = 'cmake "%s" -G"Eclipse CDT4 - Ninja"' % CMAKE_DIR
Modified: trunk/blender/build_files/cmake/project_source_info.py
===================================================================
--- trunk/blender/build_files/cmake/project_source_info.py 2013-01-24 08:49:48 UTC (rev 54069)
+++ trunk/blender/build_files/cmake/project_source_info.py 2013-01-24 08:59:48 UTC (rev 54070)
@@ -86,7 +86,7 @@
make_exe = cmake_cache_var("CMAKE_MAKE_PROGRAM")
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 ...")
process = subprocess.Popen([make_exe, "--always-make", "--dry-run", "--keep-going", "VERBOSE=1"],
stdout=subprocess.PIPE,
More information about the Bf-blender-cvs
mailing list