[vlmc-devel] Revert "Revert "Add medialibrary dependency""

Hugo Beauzée-Luyssen git at videolan.org
Mon Jul 4 15:34:31 CEST 2016


vlmc | branch: medialibrary | Hugo Beauzée-Luyssen <hugo at beauzee.fr> | Mon Jun  6 01:54:31 2016 +0200| [a221d83959a15bc4d0110a9259b6a1707f4c7d2b] | committer: Hugo Beauzée-Luyssen

Revert "Revert "Add medialibrary dependency""

This reverts commit 8f818bdda3051781f957532191faf8ff6228f46a.

> https://code.videolan.org/videolan/vlmc/commit/a221d83959a15bc4d0110a9259b6a1707f4c7d2b
---

 contribs/CMakeLists.txt | 11 +++++++++++
 src/CMakeLists.txt      |  1 +
 2 files changed, 12 insertions(+)

diff --git a/contribs/CMakeLists.txt b/contribs/CMakeLists.txt
index ad93d1e..bfcee0c 100644
--- a/contribs/CMakeLists.txt
+++ b/contribs/CMakeLists.txt
@@ -15,3 +15,14 @@ ExternalProject_Add(
     BUILD_COMMAND make
     INSTALL_COMMAND make install
 )
+
+# Now find medialibrary
+ExternalProject_Add(
+    medialibrary
+    PREFIX ${PREFIX}
+    UPDATE_COMMAND ""
+    GIT_REPOSITORY https://code.videolan.org/videolan/medialibrary.git
+    CONFIGURE_COMMAND <SOURCE_DIR>/bootstrap && <SOURCE_DIR>/configure --prefix=${PREFIX}/install --disable-tests
+    BUILD_COMMAND make
+    INSTALL_COMMAND make install
+)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 05eb06d..2251b4c 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -298,6 +298,7 @@ ELSE(NOT WITH_GUI)
 ENDIF( NOT WITH_GUI )
 
 add_dependencies(vlmc libvlcpp)
+add_dependencies(vlmc medialibrary)
 message(STATUS "Contribs prefix: ${CONTRIBS_DIR}")
 include_directories( ${CONTRIBS_DIR}/include )
 



More information about the Vlmc-devel mailing list