1 files changed, 13 insertions, 1 deletions
diff --git a/mesonbuild/backend/vs2015backend.py b/mesonbuild/backend/vs2015backend.py
index 29b33fb..1e5e171 100644
--- a/mesonbuild/backend/vs2015backend.py
+++ b/mesonbuild/backend/vs2015backend.py
@@ -13,11 +13,23 @@
 # limitations under the License.
 
 from .vs2010backend import Vs2010Backend
+from ..mesonlib import MesonException
 
 
 class Vs2015Backend(Vs2010Backend):
     def __init__(self, build):
         super().__init__(build)
         self.name = 'vs2015'
-        self.platform_toolset = 'v140'
         self.vs_version = '2015'
+        if self.environment is not None:
+            # TODO: we assume host == build
+            comps = self.environment.coredata.compilers.host
+            if comps and all(c.id == 'intel-cl' for c in comps.values()):
+                c = list(comps.values())[0]
+                if c.version.startswith('19'):
+                    self.platform_toolset = 'Intel C++ Compiler 19.0'
+                else:
+                    # We don't have support for versions older than 2019 right now.
+                    raise MesonException('There is currently no support for ICL before 19, patches welcome.')
+            if self.platform_toolset is None:
+                self.platform_toolset = 'v140'