diff options
| author | Slávek Banko <slavek.banko@axis.cz> | 2018-06-08 02:04:22 +0200 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2018-06-08 02:04:38 +0200 |
| commit | 68c89a9ce90e6911364e2e69305dcb43274eb650 (patch) | |
| tree | 8eeb79a9bcaa16a79eafc9836d621d0f214afae3 | |
| parent | 53bd3f321c8f3b7157905f31876e370c6a356598 (diff) | |
| download | tdemultimedia-68c89a9ce90e6911364e2e69305dcb43274eb650.tar.gz tdemultimedia-68c89a9ce90e6911364e2e69305dcb43274eb650.zip | |
cmake: Fix build of ogg plugin in mpeglib
This relates to bug 2844
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit d81209c6f41eb3f939b8d380c4326adf8b886403)
| -rw-r--r-- | ConfigureChecks.cmake | 2 | ||||
| -rw-r--r-- | config.h.cmake | 2 | ||||
| -rw-r--r-- | mpeglib/lib/CMakeLists.txt | 3 |
3 files changed, 4 insertions, 3 deletions
diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake index 6eb512e2..12c977ef 100644 --- a/ConfigureChecks.cmake +++ b/ConfigureChecks.cmake @@ -247,7 +247,7 @@ if( WITH_VORBIS ) endif( ) set( HAVE_VORBIS 1 ) - set( HAVE_OGG_VORBIS 1 ) + set( OGG_VORBIS 1 ) endif( WITH_VORBIS ) diff --git a/config.h.cmake b/config.h.cmake index 6f46a622..bee10800 100644 --- a/config.h.cmake +++ b/config.h.cmake @@ -26,7 +26,7 @@ #cmakedefine HAVE_LIBFLAC 1 #cmakedefine HAVE_VORBIS 1 -#cmakedefine HAVE_OGG_VORBIS 1 +#cmakedefine OGG_VORBIS 1 /* mpeglib */ #cmakedefine ATTRIBUTE_ALIGNED_MAX @ATTRIBUTE_ALIGNED_MAX@ diff --git a/mpeglib/lib/CMakeLists.txt b/mpeglib/lib/CMakeLists.txt index 0cb4b49a..a2e324fe 100644 --- a/mpeglib/lib/CMakeLists.txt +++ b/mpeglib/lib/CMakeLists.txt @@ -62,6 +62,7 @@ tde_add_library( mpeg SHARED LINK mcop kmedia2_idl soundserver_idl artsflow_idl artsmodules-shared X11 ${XEXT_LIBRARIES} m ${XV_LIBRARIES} ${DGA_LIBRARIES} ${XVIDMODE_LIBRARIES} - ${CDPARANOIA_LIBRARIES} ${VORBIS_LIBRARIES} ${VORBISFILE_LIBRARIES} pthread + ${CDPARANOIA_LIBRARIES} ${OGG_LIBRARIES} ${VORBIS_LIBRARIES} ${VORBISFILE_LIBRARIES} + pthread DESTINATION ${LIB_INSTALL_DIR} ) |