diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2013-01-24 12:59:48 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2013-01-24 12:59:48 +0400 |
| commit | a790c8c6f9e8b9f9bd954c1357c3bc826ed60c9e (patch) | |
| tree | 4dcc105e488040a8bd412a450417dcc2b96c8493 /build_files/cmake | |
| parent | 6510367c3864723449f9ce1022a55a5e60d7aef9 (diff) | |
patch [#33969] fix for [#33968] Blenders Custom Project File Generator for QtCreator fails
from Philipp Oeser (lichtwerk)
Diffstat (limited to 'build_files/cmake')
| -rwxr-xr-x | build_files/cmake/project_info.py | 2 | ||||
| -rw-r--r-- | build_files/cmake/project_source_info.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/build_files/cmake/project_info.py b/build_files/cmake/project_info.py index 99c6ad09ce5..ff123251195 100755 --- a/build_files/cmake/project_info.py +++ b/build_files/cmake/project_info.py @@ -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 diff --git a/build_files/cmake/project_source_info.py b/build_files/cmake/project_source_info.py index 1adc4689eae..f2059b18ab4 100644 --- a/build_files/cmake/project_source_info.py +++ b/build_files/cmake/project_source_info.py @@ -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, |