From dd274289bdd9ac6500cf4bf201fd5c76ec51a457 Mon Sep 17 00:00:00 2001 From: Maarten Bent Date: Thu, 29 Apr 2021 21:39:15 +0200 Subject: [PATCH 1/2] CMake: don't define WXUSINGDLL in wx-config for static library --- build/cmake/config.cmake | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/build/cmake/config.cmake b/build/cmake/config.cmake index 91d11acba2..98b505cbef 100644 --- a/build/cmake/config.cmake +++ b/build/cmake/config.cmake @@ -153,10 +153,14 @@ function(wx_write_config) set(WXCONFIG_CFLAGS "-pthread") set(WXCONFIG_LDFLAGS "-pthread") endif() - set(WXCONFIG_CPPFLAGS "-DWXUSINGDLL") + set(WXCONFIG_CPPFLAGS) + if(wxBUILD_SHARED) + wx_string_append(WXCONFIG_CPPFLAGS " -DWXUSINGDLL") + endif() foreach(flag IN LISTS wxTOOLKIT_DEFINITIONS) wx_string_append(WXCONFIG_CPPFLAGS " -D${flag}") endforeach() + string(STRIP "${WXCONFIG_CPPFLAGS}" WXCONFIG_CPPFLAGS) set(WXCONFIG_CXXFLAGS ${WXCONFIG_CFLAGS}) set(WXCONFIG_LDFLAGS_GUI) set(WXCONFIG_RESFLAGS) From e000f0d1a85db51437d49a4e2a7d164ff4c2668a Mon Sep 17 00:00:00 2001 From: Maarten Bent Date: Thu, 29 Apr 2021 21:41:06 +0200 Subject: [PATCH 2/2] CMake: add '-l' prefix to all library dependencies --- build/cmake/config.cmake | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/build/cmake/config.cmake b/build/cmake/config.cmake index 98b505cbef..d5ec8cf4fb 100644 --- a/build/cmake/config.cmake +++ b/build/cmake/config.cmake @@ -39,11 +39,10 @@ macro(wx_get_dependencies var lib) else() get_target_property(dep_name ${dep} OUTPUT_NAME) endif() - set(dep_name "-l${dep_name}") else() get_filename_component(dep_name ${dep} NAME) endif() - wx_string_append(${var} "${dep_name} ") + wx_string_append(${var} "-l${dep_name} ") endforeach() string(STRIP ${${var}} ${var}) endif()