From 72a2d22f039fde625ff5b7748d4b4af1b4a45090 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Sat, 20 Jun 2015 18:24:06 +1000 Subject: support ninja for netbeans projects --- build_files/cmake/cmake_netbeans_project.py | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) (limited to 'build_files/cmake/cmake_netbeans_project.py') diff --git a/build_files/cmake/cmake_netbeans_project.py b/build_files/cmake/cmake_netbeans_project.py index 6575e8f8cf0..d4cce46434d 100755 --- a/build_files/cmake/cmake_netbeans_project.py +++ b/build_files/cmake/cmake_netbeans_project.py @@ -40,6 +40,7 @@ from project_info import ( # is_py, cmake_advanced_info, cmake_compiler_defines, + cmake_cache_var, project_name_get, ) @@ -71,6 +72,10 @@ def create_nb_project_main(): # be tricky, get the project name from git if we can! PROJECT_NAME = project_name_get() + + make_exe = cmake_cache_var("CMAKE_MAKE_PROGRAM") + make_exe_basename = os.path.basename(make_exe) + # --------------- NB spesific defines = [("%s=%s" % cdef) if cdef[1] else cdef[0] for cdef in defines] defines += [cdef.replace("#define", "").strip() for cdef in cmake_compiler_defines()] @@ -194,9 +199,18 @@ def create_nb_project_main(): f.write(' \n') f.write(' .\n') - f.write(' ${MAKE} -f Makefile\n') - f.write(' ${MAKE} -f Makefile clean\n') + + if make_exe_basename == "ninja": + build_cmd = "ninja" + clean_cmd = "ninja -t clean" + else: + build_cmd = "${MAKE} -f Makefile" + clean_cmd = "${MAKE} -f Makefile clean" + + f.write(' %s\n' % build_cmd) + f.write(' %s\n' % clean_cmd) f.write(' ./bin/blender\n') + del build_cmd, clean_cmd def write_toolinfo(): f.write(' \n') -- cgit v1.2.3