Revision: 51344
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=51344
Author: campbellbarton
Date: 2012-10-15 14:26:14 +0000 (Mon, 15 Oct 2012)
Log Message:
-----------
another change needed for qtcreator project generator to work with ninja.
Modified Paths:
--------------
trunk/blender/build_files/cmake/project_info.py
Modified: trunk/blender/build_files/cmake/project_info.py
===================================================================
--- trunk/blender/build_files/cmake/project_info.py 2012-10-15 14:11:30 UTC
(rev 51343)
+++ trunk/blender/build_files/cmake/project_info.py 2012-10-15 14:26:14 UTC
(rev 51344)
@@ -133,12 +133,20 @@
""" Extracr includes and defines from cmake.
"""
+ make_exe = cmake_cache_var("CMAKE_MAKE_PROGRAM")
+ make_exe_basename = os.path.basename(make_exe)
+
def create_eclipse_project():
print("CMAKE_DIR %r" % CMAKE_DIR)
if sys.platform == "win32":
cmd = 'cmake "%s" -G"Eclipse CDT4 - MinGW Makefiles"' % CMAKE_DIR
else:
- cmd = 'cmake "%s" -G"Eclipse CDT4 - Unix Makefiles"' % CMAKE_DIR
+ if make_exe_basename.startswith("make"):
+ 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
+ else:
+ raise Exception("Unknown make program %r" % make_exe)
os.system(cmd)
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
