diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2017-04-14 13:36:56 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2017-04-14 13:39:54 +0300 |
| commit | 95b36321126fd6f9563b309930ac9ae6cf422a81 (patch) | |
| tree | 0722b78d4ffc69d49926d34d7ac0a9816c30dacd /build_files | |
| parent | 6cda217a82078d7bdf61caec458154a507a58947 (diff) | |
| parent | 0b55b8cc6a37fa4e74c55c9ccb54950c5f546bd6 (diff) | |
Merge branch 'master' into blender2.8
Conflicts:
source/blender/alembic/intern/abc_exporter.cc
Diffstat (limited to 'build_files')
| -rw-r--r-- | build_files/buildbot/slave_compile.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/build_files/buildbot/slave_compile.py b/build_files/buildbot/slave_compile.py index 4fb05c9f977..0e264a752d5 100644 --- a/build_files/buildbot/slave_compile.py +++ b/build_files/buildbot/slave_compile.py @@ -74,6 +74,9 @@ if 'cmake' in builder: cmake_extra_options.append('-DCMAKE_OSX_ARCHITECTURES:STRING=x86_64') cmake_extra_options.append('-DWITH_CODEC_QUICKTIME=OFF') cmake_extra_options.append('-DCMAKE_OSX_DEPLOYMENT_TARGET=10.6') + cmake_extra_options.append('-DCUDA_HOST_COMPILER=/usr/local/cuda-hack/clang') + cmake_extra_options.append('-DCUDA_NVCC_EXECUTABLE=/usr/local/cuda-hack/nvcc') + elif builder.startswith('win'): @@ -177,7 +180,7 @@ if 'cmake' in builder: os.remove('CMakeCache.txt') retcode = subprocess.call(target_chroot_prefix + ['cmake', blender_dir] + target_cmake_options) if retcode != 0: - print('Condifuration FAILED!') + print('Configuration FAILED!') sys.exit(retcode) if 'win32' in builder or 'win64' in builder: |