From aa66e4b5e96b2fa75544258546889de0e0460181 Mon Sep 17 00:00:00 2001 From: Mark Vejvoda Date: Wed, 18 Sep 2013 19:03:12 +0000 Subject: [PATCH] - updates to cmake script to detect inclusion of libvlc (and spelling mistake fix) --- mk/cmake/Modules/FindLIBVLC.cmake | 2 +- source/shared_lib/CMakeLists.txt | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/mk/cmake/Modules/FindLIBVLC.cmake b/mk/cmake/Modules/FindLIBVLC.cmake index b27a9224..92fd5bf3 100644 --- a/mk/cmake/Modules/FindLIBVLC.cmake +++ b/mk/cmake/Modules/FindLIBVLC.cmake @@ -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}") diff --git a/source/shared_lib/CMakeLists.txt b/source/shared_lib/CMakeLists.txt index 081e9011..59152937 100644 --- a/source/shared_lib/CMakeLists.txt +++ b/source/shared_lib/CMakeLists.txt @@ -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})