Hongru/cibuildwheel
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use setuptools backported versions of distutils._msvccompiler in setuptools.msvc to get environment variables from vcvarsall

Browse Source
This commit is contained in:
Yannick Jadoul
2020-05-04 23:39:59 +02:00
parent f0e65d9f5a
commit ba60f1865f
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/10_cpp_standards/cibuildwheel_test.py
+6 -6
View File
@@ -79,12 +79,12 @@ def test_cpp17_modern_msvc_workaround(tmp_path):
add_env = {'CIBW_ENVIRONMENT': 'STANDARD=17',
'DISTUTILS_USE_SDK': '1', 'MSSdk': '1'}
# Use existing distutils code to run Visual Studio's vcvarsall.bat
# MSVC++ 14.16 somehow corresponds to _MSC_VER == 1916 and should be included with
# Visual Studio 2017 version 15.9, the latest version of VS 2017
import distutils.msvc9compiler
vcvarsall_env = distutils.msvc9compiler.query_vcvarsall(14.16)
add_env.update(vcvarsall_env)
# Use existing setuptools code to run Visual Studio's vcvarsall.bat
import setuptools.msvc
vcvarsall_env = setuptools.msvc.msvc14_get_vc_env('x86')
for vc_var in ['path', 'include', 'lib']:
if vc_var in vcvarsall_env:
add_env[vc_var] = vcvarsall_env[vc_var]
actual_wheels = utils.cibuildwheel_run(project_dir, add_env=add_env)
expected_wheels = utils.expected_wheels('spam', '0.1.0')