Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'cmake-wxconfig' of https://github.com/MaartenBent/wxWidgets

Browse Source 
Fix wx-config generation in CMake build.

See https://github.com/wxWidgets/wxWidgets/pull/2353

Closes #19164.
This commit is contained in:
Vadim Zeitlin
2021-05-01 14:10:21 +02:00
parent 2f86a2e82d e000f0d1a8
commit c8c55be4ab
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
build/cmake/config.cmake
View File

@@ -39,11 +39,10 @@ macro(wx_get_dependencies var lib)
else() else()
get_target_property(dep_name ${dep} OUTPUT_NAME) get_target_property(dep_name ${dep} OUTPUT_NAME)
endif() endif()
set(dep_name "-l${dep_name}")
else() else()
get_filename_component(dep_name ${dep} NAME) get_filename_component(dep_name ${dep} NAME)
endif() endif()
wx_string_append(${var} "${dep_name} ") wx_string_append(${var} "-l${dep_name} ")
endforeach() endforeach()
string(STRIP ${${var}} ${var}) string(STRIP ${${var}} ${var})
endif() endif()
@@ -153,10 +152,14 @@ function(wx_write_config)
set(WXCONFIG_CFLAGS "-pthread") set(WXCONFIG_CFLAGS "-pthread")
set(WXCONFIG_LDFLAGS "-pthread") set(WXCONFIG_LDFLAGS "-pthread")
endif() endif()
set(WXCONFIG_CPPFLAGS "-DWXUSINGDLL") set(WXCONFIG_CPPFLAGS)
if(wxBUILD_SHARED)
wx_string_append(WXCONFIG_CPPFLAGS " -DWXUSINGDLL")
endif()
foreach(flag IN LISTS wxTOOLKIT_DEFINITIONS) foreach(flag IN LISTS wxTOOLKIT_DEFINITIONS)
wx_string_append(WXCONFIG_CPPFLAGS " -D${flag}") wx_string_append(WXCONFIG_CPPFLAGS " -D${flag}")
endforeach() endforeach()
string(STRIP "${WXCONFIG_CPPFLAGS}" WXCONFIG_CPPFLAGS)
set(WXCONFIG_CXXFLAGS ${WXCONFIG_CFLAGS}) set(WXCONFIG_CXXFLAGS ${WXCONFIG_CFLAGS})
set(WXCONFIG_LDFLAGS_GUI) set(WXCONFIG_LDFLAGS_GUI)
set(WXCONFIG_RESFLAGS) set(WXCONFIG_RESFLAGS)