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
path: root/intern
diff options
context:
space:
mode:
authorSergey Sharybin <sergey.vfx@gmail.com>2014-06-26 14:03:52 +0400
committerSergey Sharybin <sergey.vfx@gmail.com>2014-06-26 14:03:52 +0400
commit283abdf3b2de08c9e5be764a02e89120fe7b67da (patch)
tree55e438859ab4c2f53a09be09c35013d832253f56 /intern
parent0503dc3d021bbb98a0b3a5fa9878f0a0436adcee (diff)
Fix compilation error with scons and older pythons
Diffstat (limited to 'intern')
-rw-r--r--intern/cycles/kernel/SConscript3
1 files changed, 2 insertions, 1 deletions
diff --git a/intern/cycles/kernel/SConscript b/intern/cycles/kernel/SConscript
index bceab7e2b0f..cfe12e8533d 100644
--- a/intern/cycles/kernel/SConscript
+++ b/intern/cycles/kernel/SConscript
@@ -30,6 +30,7 @@ import subprocess
import sys
import os
import Blender as B
+import btools
def normpath(path):
return os.path.abspath(os.path.normpath(path))
@@ -64,7 +65,7 @@ if env['WITH_BF_CYCLES_CUDA_BINARIES']:
closure_dir = os.path.join(source_dir, "../closure")
# get CUDA version
- output = subprocess.check_output([nvcc, "--version"])
+ output = btools.get_command_output([nvcc, "--version"])
cuda_major_minor = re.findall(r'release (\d+).(\d+)', output)[0]
cuda_version = int(cuda_major_minor[0])*10 + int(cuda_major_minor[1])