diff options
| author | Martijn Berger <mberger@denc.com> | 2016-11-10 12:48:54 +0300 |
|---|---|---|
| committer | Martijn Berger <mberger@denc.com> | 2016-11-10 12:48:54 +0300 |
| commit | 8b8e04cae68b670dda6e1cceeea7f70542113a6b (patch) | |
| tree | be39f4501c42c07284ba4af99ca82051d893dea1 /build_files | |
| parent | afc8a4f9e2400e7208cc5a58c084912ffe196553 (diff) | |
let cmake handle calling msbuild for windows buildbots
Diffstat (limited to 'build_files')
| -rw-r--r-- | build_files/buildbot/slave_compile.py | 6 |
1 files changed, 2 insertions, 4 deletions
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] |