Rampoina
/
MegaGlest
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

- updates to cmake script to detect inclusion of libvlc (and spelling mistake fix)

This commit is contained in:
Mark Vejvoda 2013-09-18 19:03:12 +00:00
parent 60028086e2
commit aa66e4b5e9
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mk/cmake/Modules/FindLIBVLC.cmake
View File

@ -86,7 +86,7 @@ endif (LIBVLC_INCLUDE_DIR AND LIBVLC_LIBRARY AND LIBVLCCORE_LIBRARY)
if (LIBVLC_VERSION STRLESS "${LIBVLC_MIN_VERSION}")
message(WARNING "LibVLC version not found: version searched: ${LIBVLC_MIN_VERSION}, found ${LIBVLC_VERSION}\nUnless you are on Windows this is bound to fail.")
# only activate once version detection can be garunteed (which is currently not the case on windows)
# only activate once version detection can be guaranteed (which is currently not the case on windows)
# set(LIBVLC_FOUND FALSE)
endif (LIBVLC_VERSION STRLESS "${LIBVLC_MIN_VERSION}")

2
source/shared_lib/CMakeLists.txt
View File

@ -226,6 +226,8 @@ option(ENABLE_FRIBIDI "Enable FriBIDi support" ON)
SET(LIBVLC_MIN_VERSION "1.1.0")
FIND_PACKAGE(LIBVLC)
MESSAGE(STATUS "LIBVLC version: ${LIBVLC_VERSION} WITH_VLC macro: ${WITH_VLC}")
IF(LIBVLC_FOUND AND WITH_VLC AND NOT LIBVLC_VERSION STRLESS "${LIBVLC_MIN_VERSION}")
MESSAGE(STATUS "**NOTE: LIBVLC found so videos are supported.")
INCLUDE_DIRECTORIES(${LIBVLC_INCLUDE_DIR})