RED-595: Manual merge with weekly-webkit.

Plus some white space fixes (TABs --> spaces) in install.xml.
author: Aleric Inglewood 2010-10-15 17:49:06 +0200
committer: Aleric Inglewood 2010-10-15 17:49:06 +0200
commit: 67f55bad571044535f1d8c3b3c3afb5078249fd3 (patch)
tree: d5e9f43ed6b44837faed947a09b13648d55087ba /linden/indra/cmake
parent: Revert "port of LL renderpipeline/Kirstens S19 pipeline for bridging to Viewe... (diff)
download: meta-impy-67f55bad571044535f1d8c3b3c3afb5078249fd3.zip
meta-impy-67f55bad571044535f1d8c3b3c3afb5078249fd3.tar.gz
meta-impy-67f55bad571044535f1d8c3b3c3afb5078249fd3.tar.bz2
meta-impy-67f55bad571044535f1d8c3b3c3afb5078249fd3.tar.xz
2 files changed, 82 insertions, 18 deletions
diff --git a/linden/indra/cmake/FindLLQtWebkit.cmake b/linden/indra/cmake/FindLLQtWebkit.cmake
new file mode 100644
index 0000000..c747ec3
--- /dev/null
+++ b/linden/indra/cmake/FindLLQtWebkit.cmake
@@ -0,0 +1,62 @@
+# -*- cmake -*-
+# - Find llqtwebkit
+# Find the llqtwebkit includes and library
+# This module defines
+#  LLQTWEBKIT_INCLUDE_DIR, where to find llqtwebkit.h, etc.
+#  LLQTWEBKIT_LIBRARY, the llqtwebkit library with full path.
+#  LLQTWEBKIT_FOUND, If false, do not try to use llqtwebkit.
+# also defined, but not for general use are
+#  LLQTWEBKIT_LIBRARIES, the libraries needed to use llqtwebkit.
+#  LLQTWEBKIT_LIBRARY_DIRS, where to find the llqtwebkit library.
+#  LLQTWEBKIT_DEFINITIONS - You should add_definitions(${LLQTWEBKIT_DEFINITIONS})
+#      before compiling code that includes llqtwebkit library files.
+# Try to use pkg-config first.
+# This allows to have two different libllqtwebkit packages installed:
+# one for viewer 2.x and one for viewer 1.x.
+include(FindPkgConfig)
+if (PKG_CONFIG_FOUND)
+    if (LLQtWebkit_FIND_REQUIRED AND LLQtWebkit_FIND_VERSION)
+        set(_PACKAGE_ARGS libllqtwebkit>=${LLQtWebkit_FIND_VERSION} REQUIRED)
+    else (LLQtWebkit_FIND_REQUIRED AND LLQtWebkit_FIND_VERSION)
+        set(_PACKAGE_ARGS libllqtwebkit)
+    endif (LLQtWebkit_FIND_REQUIRED AND LLQtWebkit_FIND_VERSION)
+    if (NOT "${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}" VERSION_LESS "2.8")
+      # As virtually nobody will have a pkg-config file for this, do this check always quiet.
+      # Unfortunately cmake 2.8 or higher is required for pkg_check_modules to have a 'QUIET'.
+      set(_PACKAGE_ARGS ${_PACKAGE_ARGS} QUIET)
+    endif ()
+    pkg_check_modules(LLQTWEBKIT ${_PACKAGE_ARGS})
+endif (PKG_CONFIG_FOUND)
+set(LLQTWEBKIT_DEFINITIONS ${LLQTWEBKIT_CFLAGS_OTHER})
+find_path(LLQTWEBKIT_INCLUDE_DIR llqtwebkit.h NO_SYSTEM_ENVIRONMENT_PATH HINTS ${LLQTWEBKIT_INCLUDE_DIRS})
+find_library(LLQTWEBKIT_LIBRARY NAMES llqtwebkit NO_SYSTEM_ENVIRONMENT_PATH HINTS ${LLQTWEBKIT_LIBRARY_DIRS})
+if (NOT PKG_CONFIG_FOUND OR NOT LLQTWEBKIT_FOUND)       # If pkg-config couldn't find it, pretend we don't have pkg-config.
+   set(LLQTWEBKIT_LIBRARIES llqtwebkit)
+   get_filename_component(LLQTWEBKIT_LIBRARY_DIRS ${LLQTWEBKIT_LIBRARY} PATH)
+endif (NOT PKG_CONFIG_FOUND OR NOT LLQTWEBKIT_FOUND)
+# Handle the QUIETLY and REQUIRED arguments and set LLQTWEBKIT_FOUND
+# to TRUE if all listed variables are TRUE.
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(
+  LLQTWEBKIT
+  DEFAULT_MSG
+  LLQTWEBKIT_LIBRARY
+  LLQTWEBKIT_INCLUDE_DIR
+  LLQTWEBKIT_LIBRARIES
+  LLQTWEBKIT_LIBRARY_DIRS
+  )
+mark_as_advanced(
+  LLQTWEBKIT_LIBRARY
+  LLQTWEBKIT_INCLUDE_DIR
+  LLQTWEBKIT_LIBRARIES
+  LLQTWEBKIT_LIBRARY_DIRS
+  LLQTWEBKIT_DEFINITIONS
+  )
diff --git a/linden/indra/cmake/WebKitLibPlugin.cmake b/linden/indra/cmake/WebKitLibPlugin.cmake
index 23958fe..3eafe77 100644
--- a/linden/indra/cmake/WebKitLibPlugin.cmake
+++ b/linden/indra/cmake/WebKitLibPlugin.cmake
@@ -3,6 +3,7 @@ include(Linking)
 include(Prebuilt)
 if (STANDALONE)
+    find_package(LLQtWebkit REQUIRED QUIET)
    set(WEBKITLIBPLUGIN OFF CACHE BOOL
        "WEBKITLIBPLUGIN support for the llplugin/llmedia test apps.")
 else (STANDALONE)
@@ -31,25 +32,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)
+     if (STANDALONE)
-       set(WEBKIT_PLUGIN_LIBRARIES llqtwebkit)
+       set(WEBKIT_PLUGIN_LIBRARIES ${LLQTWEBKIT_LIBRARY})
-    else (STANDALONE)
+     else (STANDALONE)
       set(WEBKIT_PLUGIN_LIBRARIES
-           llqtwebkit
+        llqtwebkit
-           qgif
+        qgif
-           qjpeg
+        qjpeg
-           QtWebKit
+        QtWebKit
-           QtOpenGL
+        QtOpenGL
-           QtNetwork
+        QtNetwork
-           QtGui
+        QtGui
-           QtCore
+        QtCore
-           fontconfig
+        jpeg
-           X11
+        fontconfig
-           Xrender
+        X11
-           GL
+        Xrender
-           )
+        GL
-    endif (STANDALONE)
+        )
+     endif (STANDALONE)
 endif (WINDOWS)
author	Aleric Inglewood	2010-10-15 17:49:06 +0200
committer	Aleric Inglewood	2010-10-15 17:49:06 +0200
commit	67f55bad571044535f1d8c3b3c3afb5078249fd3 (patch)
tree	d5e9f43ed6b44837faed947a09b13648d55087ba /linden/indra/cmake
parent	Revert "port of LL renderpipeline/Kirstens S19 pipeline for bridging to Viewe... (diff)
download	meta-impy-67f55bad571044535f1d8c3b3c3afb5078249fd3.zip meta-impy-67f55bad571044535f1d8c3b3c3afb5078249fd3.tar.gz meta-impy-67f55bad571044535f1d8c3b3c3afb5078249fd3.tar.bz2 meta-impy-67f55bad571044535f1d8c3b3c3afb5078249fd3.tar.xz

diff --git a/linden/indra/cmake/FindLLQtWebkit.cmake b/linden/indra/cmake/FindLLQtWebkit.cmake new file mode 100644 index 0000000..c747ec3 --- /dev/null +++ b/linden/indra/cmake/FindLLQtWebkit.cmake
@@ -0,0 +1,62 @@
		1	# -- cmake --
		2
		3	# - Find llqtwebkit
		4	# Find the llqtwebkit includes and library
		5	# This module defines
		6	# LLQTWEBKIT_INCLUDE_DIR, where to find llqtwebkit.h, etc.
		7	# LLQTWEBKIT_LIBRARY, the llqtwebkit library with full path.
		8	# LLQTWEBKIT_FOUND, If false, do not try to use llqtwebkit.
		9	# also defined, but not for general use are
		10	# LLQTWEBKIT_LIBRARIES, the libraries needed to use llqtwebkit.
		11	# LLQTWEBKIT_LIBRARY_DIRS, where to find the llqtwebkit library.
		12	# LLQTWEBKIT_DEFINITIONS - You should add_definitions(${LLQTWEBKIT_DEFINITIONS})
		13	# before compiling code that includes llqtwebkit library files.
		14
		15	# Try to use pkg-config first.
		16	# This allows to have two different libllqtwebkit packages installed:
		17	# one for viewer 2.x and one for viewer 1.x.
		18	include(FindPkgConfig)
		19	if (PKG_CONFIG_FOUND)
		20	if (LLQtWebkit_FIND_REQUIRED AND LLQtWebkit_FIND_VERSION)
		21	set(_PACKAGE_ARGS libllqtwebkit>=${LLQtWebkit_FIND_VERSION} REQUIRED)
		22	else (LLQtWebkit_FIND_REQUIRED AND LLQtWebkit_FIND_VERSION)
		23	set(_PACKAGE_ARGS libllqtwebkit)
		24	endif (LLQtWebkit_FIND_REQUIRED AND LLQtWebkit_FIND_VERSION)
		25	if (NOT "${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}" VERSION_LESS "2.8")
		26	# As virtually nobody will have a pkg-config file for this, do this check always quiet.
		27	# Unfortunately cmake 2.8 or higher is required for pkg_check_modules to have a 'QUIET'.
		28	set(_PACKAGE_ARGS ${_PACKAGE_ARGS} QUIET)
		29	endif ()
		30	pkg_check_modules(LLQTWEBKIT ${_PACKAGE_ARGS})
		31	endif (PKG_CONFIG_FOUND)
		32	set(LLQTWEBKIT_DEFINITIONS ${LLQTWEBKIT_CFLAGS_OTHER})
		33
		34	find_path(LLQTWEBKIT_INCLUDE_DIR llqtwebkit.h NO_SYSTEM_ENVIRONMENT_PATH HINTS ${LLQTWEBKIT_INCLUDE_DIRS})
		35
		36	find_library(LLQTWEBKIT_LIBRARY NAMES llqtwebkit NO_SYSTEM_ENVIRONMENT_PATH HINTS ${LLQTWEBKIT_LIBRARY_DIRS})
		37
		38	if (NOT PKG_CONFIG_FOUND OR NOT LLQTWEBKIT_FOUND) # If pkg-config couldn't find it, pretend we don't have pkg-config.
		39	set(LLQTWEBKIT_LIBRARIES llqtwebkit)
		40	get_filename_component(LLQTWEBKIT_LIBRARY_DIRS ${LLQTWEBKIT_LIBRARY} PATH)
		41	endif (NOT PKG_CONFIG_FOUND OR NOT LLQTWEBKIT_FOUND)
		42
		43	# Handle the QUIETLY and REQUIRED arguments and set LLQTWEBKIT_FOUND
		44	# to TRUE if all listed variables are TRUE.
		45	include(FindPackageHandleStandardArgs)
		46	find_package_handle_standard_args(
		47	LLQTWEBKIT
		48	DEFAULT_MSG
		49	LLQTWEBKIT_LIBRARY
		50	LLQTWEBKIT_INCLUDE_DIR
		51	LLQTWEBKIT_LIBRARIES
		52	LLQTWEBKIT_LIBRARY_DIRS
		53	)
		54
		55	mark_as_advanced(
		56	LLQTWEBKIT_LIBRARY
		57	LLQTWEBKIT_INCLUDE_DIR
		58	LLQTWEBKIT_LIBRARIES
		59	LLQTWEBKIT_LIBRARY_DIRS
		60	LLQTWEBKIT_DEFINITIONS
		61	)
		62


diff --git a/linden/indra/cmake/WebKitLibPlugin.cmake b/linden/indra/cmake/WebKitLibPlugin.cmake index 23958fe..3eafe77 100644 --- a/linden/indra/cmake/WebKitLibPlugin.cmake +++ b/linden/indra/cmake/WebKitLibPlugin.cmake
@@ -3,6 +3,7 @@ include(Linking)
3	include(Prebuilt)	3	include(Prebuilt)
4		4
5	if (STANDALONE)	5	if (STANDALONE)
		6	find_package(LLQtWebkit REQUIRED QUIET)
6	set(WEBKITLIBPLUGIN OFF CACHE BOOL	7	set(WEBKITLIBPLUGIN OFF CACHE BOOL
7	"WEBKITLIBPLUGIN support for the llplugin/llmedia test apps.")	8	"WEBKITLIBPLUGIN support for the llplugin/llmedia test apps.")
8	else (STANDALONE)	9	else (STANDALONE)
@@ -31,25 +32,26 @@ if (WINDOWS)
31	elseif (DARWIN)	32	elseif (DARWIN)
32	set(WEBKIT_PLUGIN_LIBRARIES	33	set(WEBKIT_PLUGIN_LIBRARIES
33	optimized ${ARCH_PREBUILT_DIRS_RELEASE}/libllqtwebkit.dylib	34	optimized ${ARCH_PREBUILT_DIRS_RELEASE}/libllqtwebkit.dylib
34	debug ${ARCH_PREBUILT_DIRS_RELEASE}/libllqtwebkit.dylib	35	debug ${ARCH_PREBUILT_DIRS_DEBUG}/libllqtwebkit.dylib
35	)	36	)
36	elseif (LINUX)	37	elseif (LINUX)
37	if (STANDALONE)	38	if (STANDALONE)
38	set(WEBKIT_PLUGIN_LIBRARIES llqtwebkit)	39	set(WEBKIT_PLUGIN_LIBRARIES ${LLQTWEBKIT_LIBRARY})
39	else (STANDALONE)	40	else (STANDALONE)
40	set(WEBKIT_PLUGIN_LIBRARIES	41	set(WEBKIT_PLUGIN_LIBRARIES
41	llqtwebkit	42	llqtwebkit
42	qgif	43	qgif
43	qjpeg	44	qjpeg
44	QtWebKit	45	QtWebKit
45	QtOpenGL	46	QtOpenGL
46	QtNetwork	47	QtNetwork
47	QtGui	48	QtGui
48	QtCore	49	QtCore
49	fontconfig	50	jpeg
50	X11	51	fontconfig
51	Xrender	52	X11
52	GL	53	Xrender
53	)	54	GL
54	endif (STANDALONE)	55	)
		56	endif (STANDALONE)
55	endif (WINDOWS)	57	endif (WINDOWS)