From edcfeab29d1264d5bbe160f9160a163810376fe1 Mon Sep 17 00:00:00 2001
From: Maarten Bent <MaartenBent@users.noreply.github.com>
Date: Fri, 23 Dec 2022 19:40:13 +0100
Subject: [PATCH] Include arch-specific suffix in the DLL names in CMake builds
 too

Make the x64 DLL names consistent with the DLLs produced by the MSVS
projects and/or nmake makefiles.

See #23053.

Closes #23071.
---
 build/cmake/functions.cmake | 4 ++++
 1 file changed, 4 insertions(+)

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()