Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-06-18 13:24:29 +00:00
Code Issues Projects Releases Packages Wiki Activity

Auto merge of #16395 - UK992:msvc2017, r=metajack

Browse source 
Bootstrap: Fix cmake version parsing

Fixes https://github.com/servo/servo/issues/16387

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/16395)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2017-06-16 09:00:43 -07:00 • committed by GitHub
commit ffdb27ae33
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
python/servo/bootstrap.py
View file

@ -5,7 +5,7 @@
from __future__ import absolute_import, print_function from __future__ import absolute_import, print_function
from distutils.spawn import find_executable from distutils.spawn import find_executable
from distutils.version import StrictVersion from distutils.version import LooseVersion
import json import json
import os import os
import platform import platform
@ -187,7 +187,7 @@ def windows_msvc(context, force=False):
if cmake_path: if cmake_path:
cmake = subprocess.Popen([cmake_path, "--version"], stdout=PIPE) cmake = subprocess.Popen([cmake_path, "--version"], stdout=PIPE)
cmake_version = cmake.stdout.read().splitlines()[0].replace("cmake version ", "") cmake_version = cmake.stdout.read().splitlines()[0].replace("cmake version ", "")
if StrictVersion(cmake_version) >= StrictVersion(version): if LooseVersion(cmake_version) >= LooseVersion(version):
return True return True
return False return False