diff --git a/build/cmake/functions.cmake b/build/cmake/functions.cmake
index a7e290a3da..34f0b3c0cb 100644
--- a/build/cmake/functions.cmake
+++ b/build/cmake/functions.cmake
@@ -212,7 +212,9 @@ function(wx_set_target_properties target_name)
     if(wxCOMPILER_PREFIX)
         wx_string_append(dll_suffix "_${wxCOMPILER_PREFIX}")
     endif()
-    if(WIN32_MSVC_NAMING AND wxARCH_SUFFIX)
+    # For compatibility with MSVS project files and makefile.vc, use arch
+    # suffix for non-x86 (including x86_64) DLLs.
+    if(MSVC AND wxARCH_SUFFIX)
         # This one already includes the leading underscore, so don't add another one.
         wx_string_append(dll_suffix "${wxARCH_SUFFIX}")
     endif()