diff --git a/build/cmake/functions.cmake b/build/cmake/functions.cmake
index ca0bdd9784..a7e290a3da 100644
--- a/build/cmake/functions.cmake
+++ b/build/cmake/functions.cmake
@@ -212,6 +212,10 @@ 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)
+        # This one already includes the leading underscore, so don't add another one.
+        wx_string_append(dll_suffix "${wxARCH_SUFFIX}")
+    endif()
     if(wxBUILD_VENDOR)
         wx_string_append(dll_suffix "_${wxBUILD_VENDOR}")
     endif()