audacia
/
audacia
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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:
Dmitry Vedenko 2021-05-24 13:11:05 -07:00 committed by GitHub
parent cc349cce16
commit 3a04034d84
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 19 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
cmake-proxies/CMakeLists.txt
View File

@ -18,14 +18,17 @@ add_conan_lib(
expat:shared=True
)
set(wx_zlib "zlib")
set(wx_png "libpng")
set( wx_zlib "zlib" )
set( wx_png "libpng" )
set( id3tag_zlib "conan" )
if (${_OPT}use_zlib STREQUAL "system")
set(wx_zlib "sys")
if ( ${_OPT}use_zlib STREQUAL "system" )
set( wx_zlib "sys" )
# To prevent linking conflicts - we need to use system libpng as well.
# wxWdigets will attempt to resolve it using find_package
set(wx_png "sys")
set( wx_png "sys" )
set( id3tag_zlib "system" )
endif()
set(wx_expat "expat")
@ -72,17 +75,17 @@ add_conan_lib(
add_conan_lib(
libid3tag
libid3tag/0.15.1b
libid3tag/0.15.2b@audacity/stable
OPTION_NAME id3tag
HAS_ONLY_DEBUG_RELEASE
PGK_CONFIG "id3tag >= 0.15.1b"
CONAN_OPTIONS
libid3tag:zlib=${id3tag_zlib}
)
add_conan_lib(
libmad
libmad/0.15.1b
libmad/0.15.2b@audacity/stable
OPTION_NAME mad
HAS_ONLY_DEBUG_RELEASE
PGK_CONFIG "mad >= 0.15.1b"
)

9
cmake-proxies/cmake-modules/dependencies/wxwidgets.cmake
View File

@ -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 )