Fix underlinkage of libmedia_plugin_webkit.so

Fixed by updating indra/cmake/WebKitLibPlugin.cmake with
version from imprudence.

This commit also contains removal of execute permissions
of source files and configure files, sorry...
This commit is contained in:
Aleric Inglewood
2011-05-02 23:13:15 +02:00
parent c0c786b39f
commit 6848c2df6f
69 changed files with 42 additions and 19 deletions

View File

@@ -3,7 +3,29 @@ include(Linking)
include(Prebuilt)
if (STANDALONE)
find_package(LLQtWebkit REQUIRED)
# The minimal version, 4.4.3, is rather arbitrary: it's the version in Debian/Lenny.
find_package(Qt4 4.4.3 COMPONENTS QtCore QtGui QtNetwork QtOpenGL QtWebKit REQUIRED)
include(${QT_USE_FILE})
set(QTDIR $ENV{QTDIR})
if (QTDIR AND NOT "${QT_BINARY_DIR}" STREQUAL "${QTDIR}/bin")
message(FATAL_ERROR "\"${QT_BINARY_DIR}\" is unequal \"${QTDIR}/bin\"; "
"Qt is found by looking for qmake in your PATH. "
"Please set your PATH such that 'qmake' is found in \$QTDIR/bin, "
"or unset QTDIR if the found Qt is correct.")
endif (QTDIR AND NOT "${QT_BINARY_DIR}" STREQUAL "${QTDIR}/bin")
find_package(LLQtWebkit REQUIRED QUIET)
# Add the plugins.
set(QT_PLUGIN_LIBRARIES)
foreach(qlibname qgif qjpeg)
find_library(QT_PLUGIN_${qlibname} ${qlibname} PATHS ${QT_PLUGINS_DIR}/imageformats NO_DEFAULT_PATH)
if (QT_PLUGIN_${qlibname})
list(APPEND QT_PLUGIN_LIBRARIES ${QT_PLUGIN_${qlibname}})
else (QT_PLUGIN_${qtlibname})
message(FATAL_ERROR "Could not find the Qt plugin ${qlibname} in \"${QT_PLUGINS_DIR}/imageformats\"!")
endif (QT_PLUGIN_${qlibname})
endforeach(qlibname)
# qjpeg depends on libjpeg
list(APPEND QT_PLUGIN_LIBRARIES jpeg)
set(WEBKITLIBPLUGIN OFF CACHE BOOL
"WEBKITLIBPLUGIN support for the llplugin/llmedia test apps.")
else (STANDALONE)
@@ -32,25 +54,26 @@ if (WINDOWS)
elseif (DARWIN)
set(WEBKIT_PLUGIN_LIBRARIES
optimized ${ARCH_PREBUILT_DIRS_RELEASE}/libllqtwebkit.dylib
debug ${ARCH_PREBUILT_DIRS_RELEASE}/libllqtwebkit.dylib
debug ${ARCH_PREBUILT_DIRS_DEBUG}/libllqtwebkit.dylib
)
elseif (LINUX)
if (STANDALONE)
set(WEBKIT_PLUGIN_LIBRARIES ${LLQTWEBKIT_LIBRARY})
else (STANDALONE)
if (STANDALONE)
set(WEBKIT_PLUGIN_LIBRARIES ${LLQTWEBKIT_LIBRARY} ${QT_LIBRARIES} ${QT_PLUGIN_LIBRARIES})
else (STANDALONE)
set(WEBKIT_PLUGIN_LIBRARIES
llqtwebkit
qgif
qjpeg
QtWebKit
QtOpenGL
QtNetwork
QtGui
QtCore
fontconfig
X11
Xrender
GL
)
endif (STANDALONE)
llqtwebkit
qgif
qjpeg
QtWebKit
QtOpenGL
QtNetwork
QtGui
QtCore
jpeg
fontconfig
X11
Xrender
GL
)
endif (STANDALONE)
endif (WINDOWS)

0
indra/llcrashlogger/llcrashlogger.cpp Executable file → Normal file
View File

0
indra/llcrashlogger/llcrashlogger.h Executable file → Normal file
View File

0
indra/llmessage/llsdmessagebuilder.cpp Executable file → Normal file
View File

0
indra/llmessage/llsdmessagebuilder.h Executable file → Normal file
View File

0
indra/llmessage/llsdmessagereader.cpp Executable file → Normal file
View File

0
indra/llmessage/llsdmessagereader.h Executable file → Normal file
View File

0
indra/llplugin/llpluginclassmedia.cpp Executable file → Normal file
View File

0
indra/llplugin/llpluginclassmedia.h Executable file → Normal file
View File

0
indra/llplugin/llpluginclassmediaowner.h Executable file → Normal file
View File

0
indra/llplugin/llplugininstance.cpp Executable file → Normal file
View File

0
indra/llplugin/llplugininstance.h Executable file → Normal file
View File

0
indra/llplugin/llpluginmessage.cpp Executable file → Normal file
View File

0
indra/llplugin/llpluginmessage.h Executable file → Normal file
View File

0
indra/llplugin/llpluginmessageclasses.h Executable file → Normal file
View File

0
indra/llplugin/llpluginmessagepipe.cpp Executable file → Normal file
View File

0
indra/llplugin/llpluginmessagepipe.h Executable file → Normal file
View File

0
indra/llplugin/llpluginprocesschild.cpp Executable file → Normal file
View File

0
indra/llplugin/llpluginprocesschild.h Executable file → Normal file
View File

0
indra/llplugin/llpluginprocessparent.cpp Executable file → Normal file
View File

0
indra/llplugin/llpluginprocessparent.h Executable file → Normal file
View File

0
indra/llplugin/llpluginsharedmemory.cpp Executable file → Normal file
View File

0
indra/llplugin/llpluginsharedmemory.h Executable file → Normal file
View File

0
indra/llplugin/slplugin/slplugin.cpp Executable file → Normal file
View File

0
indra/llui/llmemberlistener.h Executable file → Normal file
View File

0
indra/llui/lluistring.cpp Executable file → Normal file
View File

0
indra/llui/lluistring.h Executable file → Normal file
View File

0
indra/llvfs/llpidlock.cpp Executable file → Normal file
View File

0
indra/llvfs/llpidlock.h Executable file → Normal file
View File

0
indra/llwindow/glh/glh_linear.h Executable file → Normal file
View File

0
indra/media_plugins/CMakeLists.txt Executable file → Normal file
View File

0
indra/media_plugins/base/media_plugin_base.cpp Executable file → Normal file
View File

0
indra/media_plugins/base/media_plugin_base.h Executable file → Normal file
View File

0
indra/media_plugins/example/media_plugin_example.cpp Executable file → Normal file
View File

0
indra/media_plugins/quicktime/CMakeLists.txt Executable file → Normal file
View File

View File

0
indra/media_plugins/webkit/CMakeLists.txt Executable file → Normal file
View File

0
indra/media_plugins/webkit/dummy_volume_catcher.cpp Executable file → Normal file
View File

0
indra/media_plugins/webkit/linux_volume_catcher.cpp Executable file → Normal file
View File

View File

View File

0
indra/media_plugins/webkit/mac_volume_catcher.cpp Executable file → Normal file
View File

0
indra/media_plugins/webkit/media_plugin_webkit.cpp Executable file → Normal file
View File

0
indra/media_plugins/webkit/volume_catcher.h Executable file → Normal file
View File

0
indra/media_plugins/webkit/windows_volume_catcher.cpp Executable file → Normal file
View File

0
indra/newview/hippofloaterxml.cpp Executable file → Normal file
View File

0
indra/newview/hippofloaterxml.h Executable file → Normal file
View File

0
indra/newview/llfloatersellland.cpp Executable file → Normal file
View File

0
indra/newview/llfloatersellland.h Executable file → Normal file
View File

0
indra/newview/llinventorybridge.h Executable file → Normal file
View File

0
indra/newview/lltoolpipette.cpp Executable file → Normal file
View File

0
indra/newview/lltoolpipette.h Executable file → Normal file
View File

0
indra/newview/llviewerobjectbackup.cpp Executable file → Normal file
View File

0
indra/newview/llviewerobjectbackup.h Executable file → Normal file
View File

0
indra/test/llrandom_tut.cpp Executable file → Normal file
View File

0
indra/test/llsdmessagebuilder_tut.cpp Executable file → Normal file
View File

0
indra/test/llsdmessagereader_tut.cpp Executable file → Normal file
View File

0
indra/test_apps/llplugintest/CMakeLists.txt Executable file → Normal file
View File

0
indra/test_apps/llplugintest/bookmarks.txt Executable file → Normal file
View File

0
indra/test_apps/llplugintest/demo_media_plugin.cpp Executable file → Normal file
View File

0
indra/test_apps/llplugintest/demo_media_plugin_2.cpp Executable file → Normal file
View File

0
indra/test_apps/llplugintest/demo_plugin.cpp Executable file → Normal file
View File

0
indra/test_apps/llplugintest/llmediaplugintest.cpp Executable file → Normal file
View File

0
indra/test_apps/llplugintest/llmediaplugintest.h Executable file → Normal file
View File

0
indra/test_apps/llplugintest/media_mappings.txt Executable file → Normal file
View File

0
indra/test_apps/llplugintest/media_plugin_test.cpp Executable file → Normal file
View File

0
indra/test_apps/llplugintest/media_simple_test.cpp Executable file → Normal file
View File

0
indra/test_apps/llplugintest/plugin_host.cpp Executable file → Normal file
View File

View File