1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
|
From: Beren Minor <beren.minor+git@gmail.com>
Date: Sat, 30 Aug 2014 14:54:37 +0200
Subject: DEBIAN: Don't look for unnecessary libvlccore-dev when looking for
VLC.
---
cmake/modules/FindLIBVLC.cmake | 13 ++-----------
1 file changed, 2 insertions(+), 11 deletions(-)
diff --git a/cmake/modules/FindLIBVLC.cmake b/cmake/modules/FindLIBVLC.cmake
index 04f05f3..f842fd0 100644
--- a/cmake/modules/FindLIBVLC.cmake
+++ b/cmake/modules/FindLIBVLC.cmake
@@ -41,16 +41,8 @@ FIND_LIBRARY(LIBVLC_LIBRARY NAMES vlc PATHS
NO_DEFAULT_PATH
)
FIND_LIBRARY(LIBVLC_LIBRARY NAMES vlc)
-FIND_LIBRARY(LIBVLCCORE_LIBRARY NAMES vlccore PATHS
- "$ENV{LIBVLC_LIBRARY_PATH}"
- "$ENV{LIB_DIR}/lib"
- #mingw
- c:/msys/local/lib
- NO_DEFAULT_PATH
- )
-FIND_LIBRARY(LIBVLCCORE_LIBRARY NAMES vlccore)
-IF (LIBVLC_INCLUDE_DIR AND LIBVLC_LIBRARY AND LIBVLCCORE_LIBRARY)
+IF (LIBVLC_INCLUDE_DIR AND LIBVLC_LIBRARY)
# we require this function from 2.0
execute_process(
COMMAND grep -sq libvlc_video_set_format_callbacks "${LIBVLC_INCLUDE_DIR}/vlc/libvlc_media_player.h" "${LIBVLC_INCLUDE_DIR}/libvlc_media_player.h"
@@ -63,13 +55,12 @@ IF (LIBVLC_INCLUDE_DIR AND LIBVLC_LIBRARY AND LIBVLCCORE_LIBRARY)
ELSE (LIBVLC_GOOD EQUAL 0)
message ("The VLCPlayer plugin requires at least VLC 2.0.0 to build, skipping!")
ENDIF (LIBVLC_GOOD EQUAL 0)
-ENDIF (LIBVLC_INCLUDE_DIR AND LIBVLC_LIBRARY AND LIBVLCCORE_LIBRARY)
+ENDIF (LIBVLC_INCLUDE_DIR AND LIBVLC_LIBRARY)
IF (LIBVLC_FOUND)
IF (NOT LIBVLC_FIND_QUIETLY)
MESSAGE(STATUS "Found LibVLC include-dir path: ${LIBVLC_INCLUDE_DIR}")
MESSAGE(STATUS "Found LibVLC library path:${LIBVLC_LIBRARY}")
- MESSAGE(STATUS "Found LibVLCcore library path:${LIBVLCCORE_LIBRARY}")
ENDIF (NOT LIBVLC_FIND_QUIETLY)
ELSE (LIBVLC_FOUND)
IF (LIBVLC_FIND_REQUIRED)
|
