diff --git a/CMake/win32-cache.cmake b/CMake/win32-cache.cmake
index 272f5134d1..0036723b6e 100644
--- a/CMake/win32-cache.cmake
+++ b/CMake/win32-cache.cmake
@@ -52,14 +52,6 @@ if(MINGW)
       set(HAVE_STRTOK_R 0)
     endif()
   endif()
-  if((CMAKE_COMPILER_IS_GNUCC              AND NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 4.9) OR
-     (CMAKE_C_COMPILER_ID STREQUAL "Clang" AND NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 3.6))
-    set(HAVE_STDATOMIC_H 1)
-    set(HAVE_ATOMIC 1)
-  else()
-    set(HAVE_STDATOMIC_H 0)
-    set(HAVE_ATOMIC 0)
-  endif()
 else()
   set(HAVE_LIBGEN_H 0)
   set(HAVE_FTRUNCATE 0)
@@ -73,7 +65,6 @@ else()
   if(MSVC)
     set(HAVE_UNISTD_H 0)
     set(HAVE_STDDEF_H 1)  # detected by CMake internally in check_type_size()
-    set(HAVE_STDATOMIC_H 0)
     if(MSVC_VERSION GREATER_EQUAL 1600)
       set(HAVE_STDINT_H 1)  # detected by CMake internally in check_type_size()
     else()
@@ -95,10 +86,19 @@ else()
     set(HAVE_BASENAME 0)
     set(HAVE_STRTOK_R 0)
     set(HAVE_FILE_OFFSET_BITS 0)
-    set(HAVE_ATOMIC 0)
   endif()
 endif()
 
+if((CMAKE_COMPILER_IS_GNUCC              AND NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 4.9) OR
+   (CMAKE_C_COMPILER_ID STREQUAL "Clang" AND NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 3.6))
+  # MinGW or clang-cl
+  set(HAVE_STDATOMIC_H 1)
+  set(HAVE_ATOMIC 1)
+else()
+  set(HAVE_STDATOMIC_H 0)
+  set(HAVE_ATOMIC 0)
+endif()
+
 # Available in Windows XP and newer
 set(HAVE_GETADDRINFO 1)
 set(HAVE_FREEADDRINFO 1)