diff options
| author | Michael Hirsch, Ph.D <scivision@users.noreply.github.com> | 2019-07-30 01:23:40 -0400 |
|---|---|---|
| committer | Michael Hirsch, Ph.D <scivision@users.noreply.github.com> | 2019-07-30 03:14:25 -0400 |
| commit | 667cc80f7225930eb8b239683c8297a717a087d6 (patch) | |
| tree | 3e3dd1d7922dc508006e888294f46a48530a29eb /run_tests.py | |
| parent | 3d18da0de3a3b650aa40e71a3215c9682db239a0 (diff) | |
| download | meson-667cc80f7225930eb8b239683c8297a717a087d6.zip meson-667cc80f7225930eb8b239683c8297a717a087d6.tar.gz meson-667cc80f7225930eb8b239683c8297a717a087d6.tar.bz2 | |
run_tests: ifort / intel-cl must have ninja backend
Diffstat (limited to 'run_tests.py')
| -rwxr-xr-x | run_tests.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/run_tests.py b/run_tests.py index 38c65c5..f91ec85 100755 --- a/run_tests.py +++ b/run_tests.py @@ -34,11 +34,13 @@ from mesonbuild import mlog from mesonbuild.environment import Environment, detect_ninja from mesonbuild.coredata import backendlist -def guess_backend(backend, msbuild_exe): +def guess_backend(backend, msbuild_exe: str): # Auto-detect backend if unspecified backend_flags = [] if backend is None: - if msbuild_exe is not None and mesonlib.is_windows(): + if (msbuild_exe is not None and + mesonlib.is_windows() and not + (os.environ.get('CC') == 'icl' or os.environ.get('CXX') == 'icl' or os.environ.get('FC') == 'ifort')) : backend = 'vs' # Meson will auto-detect VS version to use else: backend = 'ninja' |