[Bf-blender-cvs] [8b8e04c] master: let cmake handle calling msbuild for windows buildbots
Martijn Berger
noreply at git.blender.org
Thu Nov 10 10:49:01 CET 2016
Commit: 8b8e04cae68b670dda6e1cceeea7f70542113a6b
Author: Martijn Berger
Date: Thu Nov 10 10:48:54 2016 +0100
Branches: master
https://developer.blender.org/rB8b8e04cae68b670dda6e1cceeea7f70542113a6b
let cmake handle calling msbuild for windows buildbots
===================================================================
M build_files/buildbot/slave_compile.py
===================================================================
diff --git a/build_files/buildbot/slave_compile.py b/build_files/buildbot/slave_compile.py
index c2bfd88..d66a030 100644
--- a/build_files/buildbot/slave_compile.py
+++ b/build_files/buildbot/slave_compile.py
@@ -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]
More information about the Bf-blender-cvs
mailing list