blender
/
blender
134
398
Fork 581
Code Issues 6.3k Pull Requests 756 Projects 19 Wiki Activity

Buildbot: Correct previous release 

Seems CMake is not happy about changing compiler from script.
This commit is contained in:
Sergey Sharybin 2017-04-06 11:39:06 +02:00
parent 97300a3beb
commit ae76a90593
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
build_files/buildbot/config/blender_linux.cmake
View File

@ -21,10 +21,6 @@ else()
message(FATAL_ERROR "Unknown build environment")
endif()
# Use backported version of the compiler instead of a system default one
set(CMAKE_C_COMPILER "/usr/bin/gcc-6" CACHE STRING "" FORCE)
set(CMAKE_CXX_COMPILER "/usr/bin/g++-6" CACHE STRING "" FORCE)
# Default to only build Blender, not the player
set(WITH_BLENDER ON CACHE BOOL "" FORCE)
set(WITH_PLAYER OFF CACHE BOOL "" FORCE)

2
build_files/buildbot/slave_compile.py
View File

@ -109,6 +109,8 @@ if 'cmake' in builder:
chroot_name = 'buildbot_' + deb_name + '_i686'
cuda_chroot_name = 'buildbot_' + deb_name + '_x86_64'
targets = ['player', 'blender', 'cuda']
cmake_extra_options.extend(["-DCMAKE_C_COMPILER=/usr/bin/gcc-6",
"-DCMAKE_CXX_COMPILER=/usr/bin/g++-6"])
cmake_options.append("-C" + os.path.join(blender_dir, cmake_config_file))