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

simplified procedure for determining why 'vlc is not found'; ubuntu 14.04 also requires libvlccore-dev

This commit is contained in:
filux 2015-11-16 23:55:03 +01:00
parent f594e8a037
commit 9b7bb4246c
2 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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)

2
mk/linux/setupBuildDeps.sh
View File

@ -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
;;