cmake: Fix build of ogg plugin in mpeglib

This relates to bug 2844 Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
6 years ago · d81209c6f4
parent de908386ba
commit d81209c6f4
3 changed files with 4 additions and 3 deletions
--- 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 )

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