diff --git a/mk/cmake/Modules/FindLIBVLC.cmake b/mk/cmake/Modules/FindLIBVLC.cmake index 31b61d09..7979cfc3 100644 --- a/mk/cmake/Modules/FindLIBVLC.cmake +++ b/mk/cmake/Modules/FindLIBVLC.cmake @@ -45,6 +45,10 @@ PATHS find_path(LIBVLC_INCLUDE_DIR PATHS "${CMAKE_INCLUDE_PATH}/vlc" NAMES vlc.h HINTS ${PC_LIBVLC_INCLUDEDIR} ${PC_LIBVLC_INCLUDE_DIRS}) +if (NOT LIBVLC_FIND_QUIETLY) + message(STATUS "Found LibVLC include-dir path: [${LIBVLC_INCLUDE_DIR}]") +endif (NOT LIBVLC_FIND_QUIETLY) + # dream on libvlc doesn't support static linking set(LIBVLC_LIB_NAMES vlc libvlc) set(LIBVLC_LIB_CORE_NAMES vlccore libvlccore) @@ -65,6 +69,11 @@ PATHS c:/msys/local/lib ) find_library(LIBVLC_LIBRARY NAMES ${LIBVLC_LIB_NAMES}) + +if (NOT LIBVLC_FIND_QUIETLY) + message(STATUS "Found LibVLC library path: [${LIBVLC_LIBRARY}]") +endif (NOT LIBVLC_FIND_QUIETLY) + find_library(LIBVLCCORE_LIBRARY NAMES ${LIBVLC_LIB_CORE_NAMES} HINTS "$ENV{LIBVLC_LIBRARY_PATH}" ${PC_LIBVLC_LIBDIR} ${PC_LIBVLC_LIBRARY_DIRS} PATHS @@ -74,6 +83,10 @@ PATHS ) find_library(LIBVLCCORE_LIBRARY NAMES ${LIBVLC_LIB_CORE_NAMES}) +if (NOT LIBVLC_FIND_QUIETLY) + message(STATUS "Found LibVLCcore library path: [${LIBVLCCORE_LIBRARY}]") +endif (NOT LIBVLC_FIND_QUIETLY) + set(LIBVLC_VERSION ${PC_LIBVLC_VERSION}) if (NOT LIBVLC_VERSION) # implement means to detect version on windows (vlc --version && regex? ... ultimately we would get it from a header though...) @@ -90,7 +103,6 @@ if (LIBVLC_VERSION STRLESS "${LIBVLC_MIN_VERSION}") endif (LIBVLC_VERSION STRLESS "${LIBVLC_MIN_VERSION}") if (LIBVLC_FOUND) - if(LIBVLC_VERSION STRLESS "2.0.0") set(LIBVLC_VERSION_PRE_V2 TRUE) ENDIF() @@ -99,9 +111,6 @@ if (LIBVLC_FOUND) ENDIF() 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}") message(STATUS "Found LibVLC version: ${LIBVLC_VERSION} (searched for: ${LIBVLC_MIN_VERSION})") endif (NOT LIBVLC_FIND_QUIETLY) else (LIBVLC_FOUND) diff --git a/mk/linux/setupBuildDeps.sh b/mk/linux/setupBuildDeps.sh index 883e1916..6c4c44cb 100755 --- a/mk/linux/setupBuildDeps.sh +++ b/mk/linux/setupBuildDeps.sh @@ -125,7 +125,7 @@ case $distribution in ;; 14.04*) #LTS - installcommand="apt-get install $APT_OPTIONS build-essential cmake libsdl2-dev libalut-dev libgl1-mesa-dev libglu1-mesa-dev libvorbis-dev libwxbase2.8-dev libwxgtk2.8-dev libx11-dev liblua5.1-0-dev libjpeg-dev libpng12-dev libcurl4-gnutls-dev libxml2-dev libircclient-dev libglew-dev libftgl-dev libfribidi-dev libvlc-dev libcppunit-dev" + installcommand="apt-get install $APT_OPTIONS build-essential cmake libsdl2-dev libalut-dev libgl1-mesa-dev libglu1-mesa-dev libvorbis-dev libwxbase2.8-dev libwxgtk2.8-dev libx11-dev liblua5.1-0-dev libjpeg-dev libpng12-dev libcurl4-gnutls-dev libxml2-dev libircclient-dev libglew-dev libftgl-dev libfribidi-dev libvlc-dev libvlccore-dev libcppunit-dev" $installcommand if [ "$?" -ne "0" ]; then error_during_installation; exit 1; fi ;;