diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 2e6a1fa2d..0938f3aa7 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -134,7 +134,7 @@ if (CMAKE_C_COMPILER_ID STREQUAL "GNU" OR
     CMAKE_C_COMPILER_ID STREQUAL "Clang" OR
     CMAKE_C_COMPILER_ID STREQUAL "AppleClang")
 
-    if (CMAKE_C_SIMULATE_ID STREQUAL "MSVC")
+    if ((${CMAKE_VERSION} VERSION_GREATER_EQUAL "3.15.0" AND CMAKE_C_COMPILER_FRONTEND_VARIANT STREQUAL "MSVC") OR (${CMAKE_VERSION} VERSION_LESS "3.15.0" AND CMAKE_C_SIMULATE_ID STREQUAL "MSVC"))
         # Tell Clang-CL that this is a Clang flag
         target_compile_options(glfw PRIVATE "/clang:-Wall")
     else()