From 3e5ec00a40fa1b0431b82cff950fca9e8f99df89 Mon Sep 17 00:00:00 2001
From: Jacob Nielsen <36698748+Jacob-Nielsen@users.noreply.github.com>
Date: Sat, 22 May 2021 00:05:18 +0200
Subject: Better detection of Visual Studio compiler

---
 mesonbuild/mesonmain.py | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/mesonbuild/mesonmain.py b/mesonbuild/mesonmain.py
index 4031b0a..ce59ba4 100644
--- a/mesonbuild/mesonmain.py
+++ b/mesonbuild/mesonmain.py
@@ -54,6 +54,14 @@ def setup_vsenv():
         return
     if 'Visual Studio' in os.environ['PATH']:
         return
+    # VSINSTALL is set when running setvars from a Visual Studio installation
+    # Tested with Visual Studio 2012 and 2017
+    if 'VSINSTALLDIR' in os.environ:
+        return
+    # Check explicitly for cl when on Windows
+    if shutil.which('cl.exe'):
+        return
+
     bat_locator_bin = r'c:\Program Files (x86)\Microsoft Visual Studio\Installer\vswhere.exe'
     if not os.path.exists(bat_locator_bin):
         return
-- 
cgit v1.1