patch [#33969] fix for [#33968] Blenders Custom Project File Generator for QtCreator...
authorCampbell Barton <ideasman42@gmail.com>
Thu, 24 Jan 2013 08:59:48 +0000 (08:59 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Thu, 24 Jan 2013 08:59:48 +0000 (08:59 +0000)
from Philipp Oeser (lichtwerk)

build_files/cmake/project_info.py
build_files/cmake/project_source_info.py

index 99c6ad0..ff12325 100755 (executable)
@@ -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"):
+            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
index 1adc468..f2059b1 100644 (file)
@@ -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"):
+    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,