mirror of
https://github.com/cookiengineer/audacity
synced 2025-10-15 07:01:18 +02:00
Use Audacity patched versions of libmad and libid3tag (#928)
* Use Audacity versions of libmad and libid3tag * Properly setup zlib in libid3tag * Fixes the wxBase target for system wxWidgets
This commit is contained in:
@@ -35,6 +35,10 @@ if( ${_OPT}use_wxwidgets STREQUAL "system" )
|
||||
add_library( wxwidgets::adv ALIAS wxwidgets::wxwidgets )
|
||||
endif()
|
||||
|
||||
if( NOT TARGET wxBase )
|
||||
add_library( wxBase ALIAS wxwidgets::wxwidgets )
|
||||
endif()
|
||||
|
||||
if( NOT TARGET wxwidgets::wxwidgets )
|
||||
add_library( wxwidgets::wxwidgets ALIAS wxwidgets::wxwidgets )
|
||||
endif()
|
||||
@@ -80,6 +84,9 @@ if( ${_OPT}use_wxwidgets STREQUAL "system" )
|
||||
set( gtk gtk+-4.0 )
|
||||
set( glib glib-2.0 )
|
||||
endif()
|
||||
else()
|
||||
set_target_properties(wxwidgets::base PROPERTIES IMPORTED_GLOBAL On)
|
||||
add_library( wxBase ALIAS wxwidgets::base )
|
||||
endif()
|
||||
|
||||
if( NOT CMAKE_SYSTEM_NAME MATCHES "Windows|Darwin" )
|
||||
@@ -93,5 +100,3 @@ if( NOT CMAKE_SYSTEM_NAME MATCHES "Windows|Darwin" )
|
||||
pkg_check_modules( GLIB REQUIRED IMPORTED_TARGET GLOBAL ${glib} )
|
||||
endif()
|
||||
|
||||
set_target_properties(wxwidgets::base PROPERTIES IMPORTED_GLOBAL On)
|
||||
add_library( wxBase ALIAS wxwidgets::base )
|
||||
|
Reference in New Issue
Block a user