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

Include arch-specific suffix in the DLL names in CMake builds too

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

See #23053.

Closes #23071.
This commit is contained in:
Maarten Bent 2022-12-23 19:40:13 +01:00 • committed by Vadim Zeitlin
parent 82eb445722
commit edcfeab29d
1 changed files with 4 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

4
build/cmake/functions.cmake
View file

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