CMake: Fix wx-config library list with monolithic build
Closes https://github.com/wxWidgets/wxWidgets/pull/1132
This commit is contained in:
committed by
Vadim Zeitlin
parent
fc65bd92a6
commit
8555f4abb0
@@ -93,7 +93,8 @@ function(wx_write_config)
|
||||
set(STD_BASE_LIBS_ALL xml net base)
|
||||
set(STD_GUI_LIBS_ALL xrc html qa adv core)
|
||||
foreach(lib IN ITEMS xrc webview stc richtext ribbon propgrid aui gl media html qa adv core xml net base)
|
||||
if(TARGET ${lib})
|
||||
list(FIND wxLIB_TARGETS ${lib} hasLib)
|
||||
if (hasLib GREATER -1)
|
||||
wx_string_append(BUILT_WX_LIBS "${lib} ")
|
||||
list(FIND STD_BASE_LIBS_ALL ${lib} index)
|
||||
if (index GREATER -1)
|
||||
@@ -130,6 +131,9 @@ function(wx_write_config)
|
||||
wx_get_dependencies(EXTRALIBS_MEDIA media)
|
||||
wx_get_dependencies(OPENGL_LIBS gl)
|
||||
set(DMALLOC_LIBS)
|
||||
if(wxBUILD_MONOLITHIC)
|
||||
wx_get_dependencies(WXCONFIG_LIBS mono)
|
||||
endif()
|
||||
|
||||
set(CC ${CMAKE_C_COMPILER})
|
||||
set(CXX ${CMAKE_CXX_COMPILER})
|
||||
|
Reference in New Issue
Block a user