From 8b8e04cae68b670dda6e1cceeea7f70542113a6b Mon Sep 17 00:00:00 2001 From: Martijn Berger Date: Thu, 10 Nov 2016 10:48:54 +0100 Subject: let cmake handle calling msbuild for windows buildbots --- build_files/buildbot/slave_compile.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'build_files/buildbot') diff --git a/build_files/buildbot/slave_compile.py b/build_files/buildbot/slave_compile.py index c2bfd882fde..d66a0302be7 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] -- cgit v1.2.3