[vlmc-devel] Rename medialibrary contrib rule
Hugo Beauzée-Luyssen
git at videolan.org
Mon Jul 4 15:34:32 CEST 2016
vlmc | branch: medialibrary | Hugo Beauzée-Luyssen <hugo at beauzee.fr> | Thu Jun 2 09:26:58 2016 +0200| [49cc5982e3f862aba6ff549bbb8f669d9309c4c1] | committer: Hugo Beauzée-Luyssen
Rename medialibrary contrib rule
Otherwise cmake won't be able to link to the actual libmedialibrary...
> https://code.videolan.org/videolan/vlmc/commit/49cc5982e3f862aba6ff549bbb8f669d9309c4c1
---
contribs/CMakeLists.txt | 4 +++-
src/CMakeLists.txt | 2 +-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/contribs/CMakeLists.txt b/contribs/CMakeLists.txt
index bfcee0c..2af7f52 100644
--- a/contribs/CMakeLists.txt
+++ b/contribs/CMakeLists.txt
@@ -18,7 +18,9 @@ ExternalProject_Add(
# Now find medialibrary
ExternalProject_Add(
- medialibrary
+ # This needs to be different from medialibrary, otherwise we can't add
+ # medialibrary to our link list, since it would be a «utility target»
+ medialibrarydeps
PREFIX ${PREFIX}
UPDATE_COMMAND ""
GIT_REPOSITORY https://code.videolan.org/videolan/medialibrary.git
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 2251b4c..64cc9f7 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -298,7 +298,7 @@ ELSE(NOT WITH_GUI)
ENDIF( NOT WITH_GUI )
add_dependencies(vlmc libvlcpp)
-add_dependencies(vlmc medialibrary)
+add_dependencies(vlmc medialibrarydeps)
message(STATUS "Contribs prefix: ${CONTRIBS_DIR}")
include_directories( ${CONTRIBS_DIR}/include )
More information about the Vlmc-devel
mailing list