diff --git a/README.md b/README.md
index a87b7f0b..ab16fb1c 100644
--- a/README.md
+++ b/README.md
@@ -296,6 +296,7 @@ skills.
  - Eloi Marín Gratacós
  - Stefan Gustavson
  - Jonathan Hale
+ - hdf89shfdfs
  - Sylvain Hellegouarch
  - Matthew Henry
  - heromyth
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 71653557..68b8e9a3 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -137,7 +137,12 @@ if ("${CMAKE_C_COMPILER_ID}" STREQUAL "GNU" OR
     "${CMAKE_C_COMPILER_ID}" STREQUAL "Clang" OR
     "${CMAKE_C_COMPILER_ID}" STREQUAL "AppleClang")
 
-    target_compile_options(glfw PRIVATE "-Wall")
+    if ("${CMAKE_C_SIMULATE_ID}" STREQUAL "MSVC")
+        # Tell Clang-CL that this is a Clang flag
+        target_compile_options(glfw PRIVATE "/clang:-Wall")
+    else()
+        target_compile_options(glfw PRIVATE "-Wall")
+    endif()
 elseif (MSVC)
     target_compile_options(glfw PRIVATE "/W3")
 endif()