Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add support for Visual Studio 2017 #16307

Merged
merged 2 commits into from Apr 11, 2017
Merged
Changes from 1 commit
Commits
File filter...
Filter file types
Jump to…
Jump to file
Failed to load files.

Always

Just for now

Prev

Update cmake to 3.7.2

  • Loading branch information
UK992 committed Apr 11, 2017
commit e3654e14c58d320379e15b6b39f9b8b1ab766148
@@ -5,6 +5,7 @@
from __future__ import absolute_import, print_function

from distutils.spawn import find_executable
from distutils.version import StrictVersion
import json
import os
import platform
@@ -204,10 +205,19 @@ def version(package):
def package_dir(package):
return os.path.join(deps_dir, package, version(package))

def check_cmake(version):
cmake_path = find_executable("cmake")
if cmake_path:
cmake = subprocess.Popen([cmake_path, "--version"], stdout=PIPE)
cmake_version = cmake.stdout.read().splitlines()[0].replace("cmake version ", "")
if StrictVersion(cmake_version) >= StrictVersion(version):
return True
return False

to_install = {}
for package in packages.WINDOWS_MSVC:
# Don't install CMake if it already exists in PATH
if package == "cmake" and find_executable(package):
if package == "cmake" and check_cmake(version("cmake")):
continue

if not os.path.isdir(package_dir(package)):
@@ -18,7 +18,7 @@
])

WINDOWS_MSVC = {
"cmake": "3.6.1",
"cmake": "3.7.2",
"moztools": "0.0.1-5",
"ninja": "1.7.1",
"openssl": "1.1.0e-vs2015",
ProTip! Use n and p to navigate between commits in a pull request.
You can’t perform that action at this time.