From 15e2a2b36314935b2bcaebcd8361847959d78d1b Mon Sep 17 00:00:00 2001
From: Pierre Moreau <pierre.moreau@cs.lth.se>
Date: Mon, 13 Sep 2021 21:22:04 +0200
Subject: [PATCH] CMake: Do not use CMake 3.15 generator expressions

Fixes: 50d6d78 ("CMake: Add various MSVC-specific flags")
---
 CMakeLists.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0e77e64c..9aa73845 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -107,12 +107,12 @@ add_library (CG_Labs_options INTERFACE)
 target_compile_definitions(
 	CG_Labs_options
 	INTERFACE
-		$<$<COMPILE_LANG_AND_ID:CXX,MSVC>:NOMINMAX>
+		$<$<AND:$<COMPILE_LANGUAGE:CXX>,$<CXX_COMPILER_ID:MSVC>>:NOMINMAX>
 )
 target_compile_options (
 	CG_Labs_options
 	INTERFACE
-		$<$<COMPILE_LANG_AND_ID:CXX,MSVC>:/utf-8;/Zc:__cplusplus>
+		$<$<AND:$<COMPILE_LANGUAGE:CXX>,$<CXX_COMPILER_ID:MSVC>>:/utf-8;/Zc:__cplusplus>
 )
 target_compile_features (CG_Labs_options INTERFACE cxx_std_14)