blender
/
blender
137
404
Fork 586
Code Issues 6.2k Pull Requests 760 Projects 19 Wiki Activity

let cmake handle calling msbuild for windows buildbots

This commit is contained in:
Martijn Berger 2016-11-10 10:48:54 +01:00
parent afc8a4f9e2
commit 8b8e04cae6
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
build_files/buildbot/slave_compile.py
View File

@ -183,10 +183,8 @@ if 'cmake' in builder:
print('Condifuration FAILED!')
sys.exit(retcode)
if 'win32' in builder:
command = ['msbuild', 'INSTALL.vcxproj', '/Property:PlatformToolset=v120_xp', '/p:Configuration=Release']
elif 'win64' in builder:
command = ['msbuild', 'INSTALL.vcxproj', '/p:Configuration=Release']
if 'win32' in builder or 'win64' in builder:
command = ['cmake', '--build', '.', '--target', target_name]
else:
command = target_chroot_prefix + ['make', '-s', '-j2', target_name]