CMake: Do not use CMake 3.15 generator expressions

Fixes: 50d6d78 ("CMake: Add various MSVC-specific flags")
LUGGPublic · Sep 13, 2021 · 15e2a2b · 15e2a2b
1 parent 4432834
commit 15e2a2b
Showing 1 changed file with 2 additions and 2 deletions.
diff --git 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)