summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSlávek Banko <slavek.banko@axis.cz>2018-06-08 02:04:22 +0200
committerSlávek Banko <slavek.banko@axis.cz>2018-06-08 02:04:22 +0200
commitd81209c6f41eb3f939b8d380c4326adf8b886403 (patch)
treed88b50ee5831cf5585e38471bbbc23a8053e4ff0
parentde908386bae765e5717a5c7b804f35dbe6a44605 (diff)
downloadtdemultimedia-d81209c6.tar.gz
tdemultimedia-d81209c6.zip
cmake: Fix build of ogg plugin in mpeglib
This relates to bug 2844 Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
-rw-r--r--ConfigureChecks.cmake2
-rw-r--r--config.h.cmake2
-rw-r--r--mpeglib/lib/CMakeLists.txt3
3 files changed, 4 insertions, 3 deletions
diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake
index 6eb512e..12c977e 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 6f46a62..bee1080 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 0cb4b49..a2e324f 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}
)