solemnwarning/wxwidgets
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4

Restrict arch suffix for DLLs to MSVC in CMake builds

Browse source 
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.
This commit is contained in:
Vadim Zeitlin 2022-12-29 18:38:05 +01:00
parent e0db72d80e
commit ebf790f76e
1 changed files with 3 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

4
build/cmake/functions.cmake
View file

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