Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2018-01-26 04:29:55 +0300
committerCampbell Barton <ideasman42@gmail.com>2018-01-26 04:38:07 +0300
commit0f14c72c29c9478056f92f102ca9f94ad9f60a5c (patch)
tree89d7651a5acc00883f6e9fde6b39fc7c22c577af /build_files
parent7980265e7e509f5d9c9ed0f281c67d0662d4f464 (diff)
project_info: replace os.system w/ subprocess.check_call
Diffstat (limited to 'build_files')
-rwxr-xr-xbuild_files/cmake/project_info.py21
1 files changed, 16 insertions, 5 deletions
diff --git a/build_files/cmake/project_info.py b/build_files/cmake/project_info.py
index 9b0905da030..ad205cc228c 100755
--- a/build_files/cmake/project_info.py
+++ b/build_files/cmake/project_info.py
@@ -28,6 +28,9 @@ Module for accessing project file data for Blender.
Before use, call init(cmake_build_dir).
"""
+# TODO: Use CMAKE_EXPORT_COMPILE_COMMANDS (compile_commands.json)
+# Instead of Eclipse project format.
+
__all__ = (
"SIMPLE_PROJECTFILE",
"SOURCE_DIR",
@@ -45,14 +48,22 @@ __all__ = (
import sys
-if not sys.version.startswith("3"):
+if sys.version_info.major < 3:
print("\nPython3.x needed, found %s.\nAborting!\n" %
sys.version.partition(" ")[0])
sys.exit(1)
+import subprocess
import os
-from os.path import join, dirname, normpath, abspath, splitext, exists
+from os.path import (
+ abspath,
+ dirname,
+ exists,
+ join,
+ normpath,
+ splitext,
+)
SOURCE_DIR = join(dirname(__file__), "..", "..")
SOURCE_DIR = normpath(SOURCE_DIR)
@@ -146,13 +157,13 @@ def cmake_advanced_info():
raise Exception("Error: win32 is not supported")
else:
if make_exe_basename.startswith(("make", "gmake")):
- cmd = 'cmake "%s" -G"Eclipse CDT4 - Unix Makefiles"' % CMAKE_DIR
+ cmd = ("cmake", CMAKE_DIR, "-GEclipse CDT4 - Unix Makefiles")
elif make_exe_basename.startswith("ninja"):
- cmd = 'cmake "%s" -G"Eclipse CDT4 - Ninja"' % CMAKE_DIR
+ cmd = ("cmake", CMAKE_DIR, "-GEclipse CDT4 - Ninja")
else:
raise Exception("Unknown make program %r" % make_exe)
- os.system(cmd)
+ subprocess.check_call(cmd)
return join(CMAKE_DIR, ".cproject")
includes = []