Commit 8a4209e0 authored by Colin Guthrie's avatar Colin Guthrie Committed by Jean-Baptiste Kempf

phonon: Improve chances of finding libvlc.so.*

Search the install library path as well as the hard coded /usr/lib
and /usr/local/lib (this is particularly important on system that
use the 64 suffix on x86_64.
(cherry picked from commit 47ffd252b036e4047054e3926ba0a9f94170c35e)
Signed-off-by: default avatarJean-Baptiste Kempf <jb@videolan.org>
parent 320641ea
...@@ -197,6 +197,7 @@ set(INSTALL_TARGETS_DEFAULT_ARGS RUNTIME DESTINATION "${BIN_INSTALL_DIR}" ...@@ -197,6 +197,7 @@ set(INSTALL_TARGETS_DEFAULT_ARGS RUNTIME DESTINATION "${BIN_INSTALL_DIR}"
LIBRARY DESTINATION "${LIB_INSTALL_DIR}" LIBRARY DESTINATION "${LIB_INSTALL_DIR}"
ARCHIVE DESTINATION "${LIB_INSTALL_DIR}" COMPONENT Devel ) ARCHIVE DESTINATION "${LIB_INSTALL_DIR}" COMPONENT Devel )
add_definitions(-DPHONON_LIB_INSTALL_DIR="${LIB_INSTALL_DIR}")
# on the Mac support an extra install directory for application bundles # on the Mac support an extra install directory for application bundles
if(APPLE) if(APPLE)
set(INSTALL_TARGETS_DEFAULT_ARGS ${INSTALL_TARGETS_DEFAULT_ARGS} set(INSTALL_TARGETS_DEFAULT_ARGS ${INSTALL_TARGETS_DEFAULT_ARGS}
......
...@@ -140,7 +140,7 @@ static QStringList findAllLibVlc() ...@@ -140,7 +140,7 @@ static QStringList findAllLibVlc()
#if defined(Q_OS_UNIX) #if defined(Q_OS_UNIX)
paths = QString::fromLatin1(qgetenv("LD_LIBRARY_PATH")) paths = QString::fromLatin1(qgetenv("LD_LIBRARY_PATH"))
.split(QLatin1Char(':'), QString::SkipEmptyParts); .split(QLatin1Char(':'), QString::SkipEmptyParts);
paths << QLatin1String("/usr/lib") << QLatin1String("/usr/local/lib"); paths << QLatin1String(PHONON_LIB_INSTALL_DIR) << QLatin1String("/usr/lib") << QLatin1String("/usr/local/lib");
QStringList foundVlcs; QStringList foundVlcs;
foreach (const QString &path, paths) { foreach (const QString &path, paths) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment