Buildbot: initial work to enable CMake OSX slave
This commit is contained in:
parent
7ac5f2fef6
commit
03d9f9a619
|
@ -56,6 +56,8 @@ if 'cmake' in builder:
|
|||
cmake_options = ['-DCMAKE_BUILD_TYPE:STRING=Release']
|
||||
|
||||
if builder.startswith('mac'):
|
||||
remove_cache = True
|
||||
install_dir = None
|
||||
# Set up OSX architecture
|
||||
if builder.endswith('x86_64_cmake'):
|
||||
cmake_options.append('-DCMAKE_OSX_ARCHITECTURES:STRING=x86_64')
|
||||
|
|
|
@ -103,7 +103,7 @@ if builder.find('scons') != -1:
|
|||
sys.exit(retcode)
|
||||
else:
|
||||
# CMake
|
||||
if 'win' in builder:
|
||||
if 'win' in builder or 'mac' in builder:
|
||||
os.chdir(build_dir)
|
||||
|
||||
files = [f for f in os.listdir('.') if os.path.isfile(f) and f.endswith('.zip')]
|
||||
|
|
|
@ -35,7 +35,7 @@ blender_dir = '../blender.git'
|
|||
if "cmake" in builder:
|
||||
# cmake
|
||||
|
||||
if "linux" in builder:
|
||||
if "linux" in builder or 'mac' in builder:
|
||||
print("Automated tests are still DISABLED!")
|
||||
sys.exit(0)
|
||||
|
||||
|
|
Loading…
Reference in New Issue