CMake: use wx prefix in library names
Rename all library targets to start with wx. This way it does not use generic names like base or core that could interfere with other libraries that add include the wxWidgets project.
This commit is contained in:
@@ -29,8 +29,8 @@ endmacro()
|
||||
|
||||
macro(wx_get_dependencies var lib)
|
||||
set(${var})
|
||||
if(TARGET ${lib})
|
||||
get_target_property(deps ${lib} LINK_LIBRARIES)
|
||||
if(TARGET wx${lib})
|
||||
get_target_property(deps wx${lib} LINK_LIBRARIES)
|
||||
foreach(dep IN LISTS deps)
|
||||
if(TARGET ${dep})
|
||||
get_target_property(dep_name ${dep} OUTPUT_NAME)
|
||||
@@ -98,7 +98,7 @@ 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)
|
||||
list(FIND wxLIB_TARGETS ${lib} hasLib)
|
||||
list(FIND wxLIB_TARGETS wx${lib} hasLib)
|
||||
if (hasLib GREATER -1)
|
||||
wx_string_append(BUILT_WX_LIBS "${lib} ")
|
||||
list(FIND STD_BASE_LIBS_ALL ${lib} index)
|
||||
|
Reference in New Issue
Block a user