diff options
| author | Slávek Banko <[email protected]> | 2018-06-10 15:17:39 +0200 |
|---|---|---|
| committer | Slávek Banko <[email protected]> | 2018-06-10 15:17:52 +0200 |
| commit | 3c0e3b338463b44724c86a986699f450522b2213 (patch) | |
| tree | 4175d3d783b7b5a8166b214bd1f0ebcc9817af51 | |
| parent | 797f06bd00da1b4cc23560ce90495fba79ba6b3a (diff) | |
| download | tdemultimedia-3c0e3b338463b44724c86a986699f450522b2213.tar.gz tdemultimedia-3c0e3b338463b44724c86a986699f450522b2213.zip | |
cmake: Add check of libvorbis version
This is essential for applications that encode to ogg
Signed-off-by: Slávek Banko <[email protected]>
(cherry picked from commit 43a99c946ec2187d0e276615d337ad47276f553a)
| -rw-r--r-- | ConfigureChecks.cmake | 7 | ||||
| -rw-r--r-- | config.h.cmake | 2 |
2 files changed, 7 insertions, 2 deletions
diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake index c5b7c0fe..c51954e6 100644 --- a/ConfigureChecks.cmake +++ b/ConfigureChecks.cmake @@ -255,7 +255,12 @@ if( WITH_VORBIS ) tde_message_fatal( "Ogg/Vorbis support are requested, but `libvorbisenc` not found" ) endif( ) - set( HAVE_VORBIS 1 ) + check_library_exists( vorbis vorbis_bitrate_addblock "${VORBIS_LIBRARY_DIRS}" HAVE_VORBIS_2 ) + if( HAVE_VORBIS_2 ) + set( HAVE_VORBIS 2 ) + else( ) + set( HAVE_VORBIS 1 ) + endif( ) set( OGG_VORBIS 1 ) endif( WITH_VORBIS ) diff --git a/config.h.cmake b/config.h.cmake index 61dd9169..812818bb 100644 --- a/config.h.cmake +++ b/config.h.cmake @@ -31,7 +31,7 @@ #cmakedefine HAVE_MACHINE_SOUNDCARD_H 1 #cmakedefine HAVE_LIBFLAC 1 -#cmakedefine HAVE_VORBIS 1 +#cmakedefine HAVE_VORBIS @HAVE_VORBIS@ #cmakedefine OGG_VORBIS 1 /* mpeglib */ |