From ebf790f76e14e6793766b9c907de0fecce553a68 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Thu, 29 Dec 2022 18:38:05 +0100 Subject: [PATCH] Restrict arch suffix for DLLs to MSVC in CMake builds Amend the changes of edcfeab29d (Include arch-specific suffix in the DLL names in CMake builds too, 2022-12-23) to only do it when using MSVC but not the other compilers as this would make CMake incompatible with what makefile.gcc does. --- build/cmake/functions.cmake | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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()