[Bf-blender-cvs] [32a4403] master: Add msbuild for windows cmake buildbots
Martijn Berger
noreply at git.blender.org
Tue Nov 11 11:25:50 CET 2014
Commit: 32a440361728ebc416fb99862befb95b8fa27a48
Author: Martijn Berger
Date: Tue Nov 11 11:22:49 2014 +0100
Branches: master
https://developer.blender.org/rB32a440361728ebc416fb99862befb95b8fa27a48
Add msbuild for windows cmake 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 a5dadbd..c9a2891 100644
--- a/build_files/buildbot/slave_compile.py
+++ b/build_files/buildbot/slave_compile.py
@@ -33,7 +33,7 @@ builder = sys.argv[1]
# we run from build/ directory
blender_dir = '../blender.git'
-if builder.find('cmake') != -1:
+if 'cmake' in builder:
# cmake
# set build options
@@ -46,11 +46,21 @@ if builder.find('cmake') != -1:
elif builder.endswith('mac_ppc_cmake'):
cmake_options.append('-DCMAKE_OSX_ARCHITECTURES:STRING=ppc')
+ if 'win64' in builder:
+
+ cmake_options.append('-G Visual Studio 12 2013 Win64')
+ elif 'win32' in builder:
+ cmake_options.append('-G Visual Studio 12 2013')
+
+
# configure and make
retcode = subprocess.call(['cmake', blender_dir] + cmake_options)
if retcode != 0:
sys.exit(retcode)
- retcode = subprocess.call(['make', '-s', '-j4', 'install'])
+ if 'win' in builder:
+ retcode = subprocess.call(['msbuild', 'INSTALL.vcxproj', '/p:Configuration=Release'])
+ else:
+ retcode = subprocess.call(['make', '-s', '-j4', 'install'])
sys.exit(retcode)
else:
python_bin = 'python'
More information about the Bf-blender-cvs
mailing list