diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 463b898d..5b552f73 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -258,7 +258,14 @@ elseif (CMAKE_C_COMPILER_ID STREQUAL "GNU" OR
 endif()
 
 if (GLFW_BUILD_WIN32)
-    target_compile_definitions(glfw PRIVATE UNICODE _UNICODE)
+    # If requested, create a C #define to set the app's window class name.
+    # This class name is baked in at compile time.
+    set(_GLFW_WCN "")
+    if (GLFW_WNDCLASSNAME)
+        set(_GLFW_WCN "_GLFW_WNDCLASSNAME=L\"${GLFW_WNDCLASSNAME}\"")
+    endif()
+
+    target_compile_definitions(glfw PRIVATE UNICODE _UNICODE ${_GLFW_WCN})
 endif()
 
 # HACK: When building on MinGW, WINVER and UNICODE need to be defined before