[Bf-blender-cvs] [ac43e5cc87a] master: Buildbot: Remove global hardcoded NVCC path
Sergey Sharybin
noreply at git.blender.org
Wed Mar 29 10:22:01 CEST 2017
Commit: ac43e5cc87a75b99a86d9caf174b9af07421c18b
Author: Sergey Sharybin
Date: Wed Mar 29 10:16:41 2017 +0200
Branches: master
https://developer.blender.org/rBac43e5cc87a75b99a86d9caf174b9af07421c18b
Buildbot: Remove global hardcoded NVCC path
This was initially needed for heterogeneous setup of two toolkits which
we no longer need.
===================================================================
M build_files/buildbot/slave_compile.py
===================================================================
diff --git a/build_files/buildbot/slave_compile.py b/build_files/buildbot/slave_compile.py
index 1d42f04f151..c8d69c38644 100644
--- a/build_files/buildbot/slave_compile.py
+++ b/build_files/buildbot/slave_compile.py
@@ -91,7 +91,6 @@ if 'cmake' in builder:
elif builder.startswith('win32'):
bits = 32
cmake_options.extend(['-G', 'Visual Studio 12 2013'])
- cmake_extra_options.append('-DCUDA_NVCC_EXECUTABLE:FILEPATH=C:/Program Files/NVIDIA GPU Computing Toolkit/CUDA/v8.0/bin/nvcc.exe')
elif builder.startswith('linux'):
tokens = builder.split("_")
@@ -111,8 +110,6 @@ if 'cmake' in builder:
cuda_chroot_name = 'buildbot_' + deb_name + '_x86_64'
targets = ['player', 'blender', 'cuda']
- cmake_extra_options.append('-DCUDA_NVCC_EXECUTABLE=/usr/local/cuda/bin/nvcc')
-
cmake_options.append("-C" + os.path.join(blender_dir, cmake_config_file))
# Prepare CMake options needed to configure cuda binaries compilation.
More information about the Bf-blender-cvs
mailing list