aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/cmake
diff options
context:
space:
mode:
authorArmin Weatherwax2010-06-14 12:04:49 +0200
committerArmin Weatherwax2010-09-23 15:38:25 +0200
commit35df5441d3e2789663532c948731aff3a1e04728 (patch)
treeac7674289784a5f96106ea507637055a8dada78a /linden/indra/cmake
parentChanged version to Experimental 2010.09.18 (diff)
downloadmeta-impy-35df5441d3e2789663532c948731aff3a1e04728.zip
meta-impy-35df5441d3e2789663532c948731aff3a1e04728.tar.gz
meta-impy-35df5441d3e2789663532c948731aff3a1e04728.tar.bz2
meta-impy-35df5441d3e2789663532c948731aff3a1e04728.tar.xz
llmediaplugins first step
Diffstat (limited to '')
-rw-r--r--linden/indra/cmake/00-Common.cmake4
-rw-r--r--linden/indra/cmake/FindNDOF.cmake39
-rw-r--r--linden/indra/cmake/GStreamer010Plugin.cmake39
-rw-r--r--linden/indra/cmake/Glui.cmake28
-rw-r--r--linden/indra/cmake/Glut.cmake19
-rw-r--r--linden/indra/cmake/LLAudio.cmake2
-rw-r--r--linden/indra/cmake/LLMedia.cmake13
-rw-r--r--linden/indra/cmake/LLPlugin.cmake8
-rw-r--r--linden/indra/cmake/MediaPluginBase.cmake8
-rw-r--r--linden/indra/cmake/Mozlib.cmake47
-rw-r--r--linden/indra/cmake/NDOF.cmake32
-rw-r--r--linden/indra/cmake/OPENAL.cmake13
-rw-r--r--linden/indra/cmake/OPENAL.cmake.imp115
-rw-r--r--linden/indra/cmake/PluginAPI.cmake16
-rw-r--r--linden/indra/cmake/QuickTimePlugin.cmake46
-rw-r--r--linden/indra/cmake/WebKitLibPlugin.cmake55
-rw-r--r--linden/indra/cmake/linden%2findra%2fcmake%2fCopyWinLibs.cmake.rej.txt257
17 files changed, 664 insertions, 77 deletions
diff --git a/linden/indra/cmake/00-Common.cmake b/linden/indra/cmake/00-Common.cmake
index d1f379c..d335cb0 100644
--- a/linden/indra/cmake/00-Common.cmake
+++ b/linden/indra/cmake/00-Common.cmake
@@ -9,9 +9,9 @@ include(Variables)
9 9
10set(CMAKE_CXX_FLAGS_DEBUG "-D_DEBUG -DLL_DEBUG=1") 10set(CMAKE_CXX_FLAGS_DEBUG "-D_DEBUG -DLL_DEBUG=1")
11set(CMAKE_CXX_FLAGS_RELEASE 11set(CMAKE_CXX_FLAGS_RELEASE
12 "-DLL_RELEASE=1 -DLL_RELEASE_FOR_DOWNLOAD=1 -D_SECURE_SCL=0 -DNDEBUG") 12 "-DLL_RELEASE=1 -DLL_RELEASE_FOR_DOWNLOAD=1 -D_SECURE_SCL=0 -DLL_SEND_CRASH_REPORTS=1 -DNDEBUG")
13set(CMAKE_CXX_FLAGS_RELWITHDEBINFO 13set(CMAKE_CXX_FLAGS_RELWITHDEBINFO
14 "-DLL_RELEASE=1 -D_SECURE_SCL=0 -DNDEBUG -DLL_RELEASE_WITH_DEBUG_INFO=1") 14 "-DLL_RELEASE=1 -D_SECURE_SCL=0 -DLL_SEND_CRASH_REPORTS=0 -DNDEBUG -DLL_RELEASE_WITH_DEBUG_INFO=1")
15 15
16 16
17# Don't bother with a MinSizeRel build. 17# Don't bother with a MinSizeRel build.
diff --git a/linden/indra/cmake/FindNDOF.cmake b/linden/indra/cmake/FindNDOF.cmake
new file mode 100644
index 0000000..f980e34
--- /dev/null
+++ b/linden/indra/cmake/FindNDOF.cmake
@@ -0,0 +1,39 @@
1# -*- cmake -*-
2
3# - Find NDOF
4# Find the NDOF includes and library
5# This module defines
6# NDOF_INCLUDE_DIR, where to find ndofdev_external.h, etc.
7# NDOF_LIBRARY, the library needed to use NDOF.
8# NDOF_FOUND, If false, do not try to use NDOF.
9
10find_path(NDOF_INCLUDE_DIR ndofdev_external.h
11 PATH_SUFFIXES ndofdev
12 )
13
14set(NDOF_NAMES ${NDOF_NAMES} ndofdev libndofdev)
15find_library(NDOF_LIBRARY
16 NAMES ${NDOF_NAMES}
17 )
18
19if (NDOF_LIBRARY AND NDOF_INCLUDE_DIR)
20 set(NDOF_FOUND "YES")
21else (NDOF_LIBRARY AND NDOF_INCLUDE_DIR)
22 set(NDOF_FOUND "NO")
23endif (NDOF_LIBRARY AND NDOF_INCLUDE_DIR)
24
25
26if (NDOF_FOUND)
27 if (NOT NDOF_FIND_QUIETLY)
28 message(STATUS "Found NDOF: Library in '${NDOF_LIBRARY}' and header in '${NDOF_INCLUDE_DIR}' ")
29 endif (NOT NDOF_FIND_QUIETLY)
30else (NDOF_FOUND)
31 if (NDOF_FIND_REQUIRED)
32 message(FATAL_ERROR "Could not find NDOF library!")
33 endif (NDOF_FIND_REQUIRED)
34endif (NDOF_FOUND)
35
36mark_as_advanced(
37 NDOF_LIBRARY
38 NDOF_INCLUDE_DIR
39 )
diff --git a/linden/indra/cmake/GStreamer010Plugin.cmake b/linden/indra/cmake/GStreamer010Plugin.cmake
new file mode 100644
index 0000000..0d33483
--- /dev/null
+++ b/linden/indra/cmake/GStreamer010Plugin.cmake
@@ -0,0 +1,39 @@
1# -*- cmake -*-
2include(Prebuilt)
3
4if (STANDALONE)
5 include(FindPkgConfig)
6
7 pkg_check_modules(GSTREAMER010 REQUIRED gstreamer-0.10)
8 pkg_check_modules(GSTREAMER010_PLUGINS_BASE REQUIRED gstreamer-plugins-base-0.10)
9elseif (LINUX)
10 use_prebuilt_binary(gstreamer)
11 # possible libxml should have its own .cmake file instead
12 use_prebuilt_binary(libxml)
13 set(GSTREAMER010_FOUND ON FORCE BOOL)
14 set(GSTREAMER010_PLUGINS_BASE_FOUND ON FORCE BOOL)
15 set(GSTREAMER010_INCLUDE_DIRS
16 ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include/gstreamer-0.10
17 ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include/glib-2.0
18 ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include/libxml2
19 )
20 # We don't need to explicitly link against gstreamer itself, because
21 # LLMediaImplGStreamer probes for the system's copy at runtime.
22 set(GSTREAMER010_LIBRARIES
23 gobject-2.0
24 gmodule-2.0
25 dl
26 gthread-2.0
27 rt
28 glib-2.0
29 )
30endif (STANDALONE)
31
32if (GSTREAMER010_FOUND AND GSTREAMER010_PLUGINS_BASE_FOUND)
33 set(GSTREAMER010 ON CACHE BOOL "Build with GStreamer-0.10 streaming media support.")
34endif (GSTREAMER010_FOUND AND GSTREAMER010_PLUGINS_BASE_FOUND)
35
36if (GSTREAMER010)
37 add_definitions(-DLL_GSTREAMER010_ENABLED=1)
38endif (GSTREAMER010)
39
diff --git a/linden/indra/cmake/Glui.cmake b/linden/indra/cmake/Glui.cmake
new file mode 100644
index 0000000..f62a568
--- /dev/null
+++ b/linden/indra/cmake/Glui.cmake
@@ -0,0 +1,28 @@
1# -*- cmake -*-
2include(Linking)
3include(Prebuilt)
4
5if (STANDALONE)
6 set(GLUI OFF CACHE BOOL
7 "GLUI support for the llplugin/llmedia test apps.")
8else (STANDALONE)
9 use_prebuilt_binary(glui)
10 set(GLUI ON CACHE BOOL
11 "GLUI support for the llplugin/llmedia test apps.")
12endif (STANDALONE)
13
14if (LINUX)
15 set(GLUI ON CACHE BOOL
16 "llplugin media apps HACK for Linux.")
17endif (LINUX)
18
19if (DARWIN OR LINUX)
20 set(GLUI_LIBRARY
21 glui)
22endif (DARWIN OR LINUX)
23
24if (WINDOWS)
25 set(GLUI_LIBRARY
26 debug glui32.lib
27 optimized glui32.lib)
28endif (WINDOWS)
diff --git a/linden/indra/cmake/Glut.cmake b/linden/indra/cmake/Glut.cmake
new file mode 100644
index 0000000..314da30
--- /dev/null
+++ b/linden/indra/cmake/Glut.cmake
@@ -0,0 +1,19 @@
1# -*- cmake -*-
2include(Linking)
3include(Prebuilt)
4
5if (WINDOWS)
6 use_prebuilt_binary(freeglut)
7 set(GLUT_LIBRARY
8 debug freeglut_static.lib
9 optimized freeglut_static.lib)
10endif (WINDOWS)
11
12if (LINUX)
13 FIND_LIBRARY(GLUT_LIBRARY glut)
14endif (LINUX)
15
16if (DARWIN)
17 include(CMakeFindFrameworks)
18 find_library(GLUT_LIBRARY GLUT)
19endif (DARWIN)
diff --git a/linden/indra/cmake/LLAudio.cmake b/linden/indra/cmake/LLAudio.cmake
index 625e212..89b790c 100644
--- a/linden/indra/cmake/LLAudio.cmake
+++ b/linden/indra/cmake/LLAudio.cmake
@@ -1,11 +1,9 @@
1# -*- cmake -*- 1# -*- cmake -*-
2 2
3include(Audio) 3include(Audio)
4include(OPENAL)
5 4
6set(LLAUDIO_INCLUDE_DIRS 5set(LLAUDIO_INCLUDE_DIRS
7 ${LIBS_OPEN_DIR}/llaudio 6 ${LIBS_OPEN_DIR}/llaudio
8 ${OPENAL_INCLUDE_DIRS}
9 ) 7 )
10 8
11set(LLAUDIO_LIBRARIES llaudio ${OPENAL_LIBRARIES}) 9set(LLAUDIO_LIBRARIES llaudio ${OPENAL_LIBRARIES})
diff --git a/linden/indra/cmake/LLMedia.cmake b/linden/indra/cmake/LLMedia.cmake
deleted file mode 100644
index 8a36a69..0000000
--- a/linden/indra/cmake/LLMedia.cmake
+++ /dev/null
@@ -1,13 +0,0 @@
1# -*- cmake -*-
2
3include(GStreamer)
4
5set(LLMEDIA_INCLUDE_DIRS
6 ${LIBS_OPEN_DIR}/llmedia
7 )
8
9set(LLMEDIA_LIBRARIES
10 llmedia
11 ${GSTREAMER_LIBRARIES}
12 ${GSTREAMER_PLUGINS_BASE_LIBRARIES}
13 )
diff --git a/linden/indra/cmake/LLPlugin.cmake b/linden/indra/cmake/LLPlugin.cmake
new file mode 100644
index 0000000..9722f16
--- /dev/null
+++ b/linden/indra/cmake/LLPlugin.cmake
@@ -0,0 +1,8 @@
1# -*- cmake -*-
2
3
4set(LLPLUGIN_INCLUDE_DIRS
5 ${LIBS_OPEN_DIR}/llplugin
6 )
7
8set(LLPLUGIN_LIBRARIES llplugin)
diff --git a/linden/indra/cmake/MediaPluginBase.cmake b/linden/indra/cmake/MediaPluginBase.cmake
new file mode 100644
index 0000000..2be035b
--- /dev/null
+++ b/linden/indra/cmake/MediaPluginBase.cmake
@@ -0,0 +1,8 @@
1# -*- cmake -*-
2
3
4set(MEDIA_PLUGIN_BASE_INCLUDE_DIRS
5 ${LIBS_OPEN_DIR}/media_plugins/base/
6 )
7
8set(MEDIA_PLUGIN_BASE_LIBRARIES media_plugin_base)
diff --git a/linden/indra/cmake/Mozlib.cmake b/linden/indra/cmake/Mozlib.cmake
index e9555df..e69de29 100644
--- a/linden/indra/cmake/Mozlib.cmake
+++ b/linden/indra/cmake/Mozlib.cmake
@@ -1,47 +0,0 @@
1# -*- cmake -*-
2include(Linking)
3include(Prebuilt)
4
5if (STANDALONE)
6 set(MOZLIB OFF CACHE BOOL
7 "Enable Mozilla support in the viewer (requires llmozlib library).")
8else (STANDALONE)
9 use_prebuilt_binary(llmozlib)
10 set(MOZLIB ON CACHE BOOL
11 "Enable Mozilla support in the viewer (requires llmozlib library).")
12endif (STANDALONE)
13
14if (MOZLIB)
15 add_definitions(-DLL_LLMOZLIB_ENABLED=1)
16
17 if (LINUX)
18 link_directories(${CMAKE_SOURCE_DIR}/newview/app_settings/mozilla-runtime-linux-${ARCH})
19 set(MOZLIB_LIBRARIES
20 llmozlib2
21 mozjs
22 nspr4
23 plc4
24 plds4
25 xpcom
26 xul
27 profdirserviceprovider_s
28 )
29 elseif (WINDOWS)
30 if (MSVC71)
31 set(MOZLIB_LIBRARIES
32 debug llmozlib2d
33 optimized llmozlib2)
34 elseif (MSVC80 OR MSVC90)
35 set(MOZLIB_LIBRARIES
36 debug llmozlib2d-vc80
37 optimized llmozlib2-vc80)
38 endif (MSVC71)
39 else (LINUX)
40 set(MOZLIB_LIBRARIES
41 optimized ${ARCH_PREBUILT_DIRS_RELEASE}/libllmozlib2.dylib
42 debug ${ARCH_PREBUILT_DIRS_DEBUG}/libllmozlib2.dylib
43 )
44 endif (LINUX)
45else (MOZLIB)
46 add_definitions(-DLL_LLMOZLIB_ENABLED=0)
47endif (MOZLIB)
diff --git a/linden/indra/cmake/NDOF.cmake b/linden/indra/cmake/NDOF.cmake
index dad74e9..bdf5db1 100644
--- a/linden/indra/cmake/NDOF.cmake
+++ b/linden/indra/cmake/NDOF.cmake
@@ -1,14 +1,28 @@
1# -*- cmake -*- 1# -*- cmake -*-
2include(Prebuilt) 2include(Prebuilt)
3 3
4use_prebuilt_binary(ndofdev) 4if (STANDALONE)
5 include(FindNDOF)
6 if(NOT NDOF_FOUND)
7 message(STATUS "Building without N-DoF joystick support")
8 endif(NOT NDOF_FOUND)
9else (STANDALONE)
10 use_prebuilt_binary(ndofdev)
5 11
6if (WINDOWS OR DARWIN OR LINUX) 12 if (WINDOWS)
7 add_definitions(-DLIB_NDOF=1) 13 set(NDOF_LIBRARY libndofdev)
8endif (WINDOWS OR DARWIN OR LINUX) 14 elseif (DARWIN OR LINUX)
15 set(NDOF_LIBRARY ndofdev)
16 endif (WINDOWS)
17
18 set(NDOF_INCLUDE_DIR ${ARCH_PREBUILT_DIRS}/include/ndofdev)
19 set(NDOF_FOUND 1)
20endif (STANDALONE)
9 21
10if (WINDOWS) 22if (NDOF_FOUND)
11 set(NDOF_LIBRARY libndofdev) 23 add_definitions(-DLIB_NDOF=1)
12elseif (DARWIN OR LINUX) 24 include_directories(${NDOF_INCLUDE_DIR})
13 set(NDOF_LIBRARY ndofdev) 25else (NDOF_FOUND)
14endif (WINDOWS) 26 set(NDOF_INCLUDE_DIR "")
27 set(NDOF_LIBRARY "")
28endif (NDOF_FOUND)
diff --git a/linden/indra/cmake/OPENAL.cmake b/linden/indra/cmake/OPENAL.cmake
index 4f0e0cc..f7ebfe6 100644
--- a/linden/indra/cmake/OPENAL.cmake
+++ b/linden/indra/cmake/OPENAL.cmake
@@ -1,10 +1,12 @@
1# -*- cmake -*- 1# -*- cmake -*-
2
3include(Variables)
4include(Linking) 2include(Linking)
3include(Prebuilt)
5 4
6set(OPENAL ON CACHE BOOL "Enable OpenAL") 5if (LINUX)
7 6 set(OPENAL ON CACHE BOOL "Enable OpenAL")
7else (LINUX)
8 set(OPENAL OFF CACHE BOOL "Enable OpenAL")
9endif (LINUX)
8 10
9if (OPENAL) 11if (OPENAL)
10 12
@@ -109,5 +111,8 @@ if (OPENAL)
109 set(OPENAL_FOUND TRUE CACHE BOOL 111 set(OPENAL_FOUND TRUE CACHE BOOL
110 "Found OpenAL and ALUT libraries successfully" 112 "Found OpenAL and ALUT libraries successfully"
111 ) 113 )
114endif (OPENAL)
112 115
116if (OPENAL)
117 message(STATUS "Building with OpenAL audio support")
113endif (OPENAL) 118endif (OPENAL)
diff --git a/linden/indra/cmake/OPENAL.cmake.imp b/linden/indra/cmake/OPENAL.cmake.imp
new file mode 100644
index 0000000..60abef3
--- /dev/null
+++ b/linden/indra/cmake/OPENAL.cmake.imp
@@ -0,0 +1,115 @@
1# -*- cmake -*-
2
3include(Variables)
4include(Linking)
5
6set(OPENAL ON CACHE BOOL "Enable OpenAL")
7
8
9if (OPENAL)
10
11 # message(STATUS "Building with OpenAL audio support")
12
13 # OPENAL_LIB
14 use_prebuilt_binary(openal)
15
16 if (WINDOWS)
17 set(OPENAL_LIB
18 optimized ${ARCH_PREBUILT_DIRS_RELEASE}/openal32.lib
19 debug ${ARCH_PREBUILT_DIRS_DEBUG}/openal32.lib
20 )
21
22 elseif (DARWIN)
23 # Look for for system's OpenAL.framework
24 find_library(OPENAL_LIB
25 NAMES openal.1
26 PATHS ${ARCH_PREBUILT_DIRS_RELEASE}
27 NO_DEFAULT_PATH
28 )
29 else (WINDOWS)
30 set(OPENAL_LIB openal)
31 endif (WINDOWS)
32
33 if (NOT OPENAL_LIB)
34 message(FATAL_ERROR "OpenAL not found!")
35 else (NOT OPENAL_LIB)
36 # message(STATUS "OpenAL found: ${OPENAL_LIB}")
37 endif (NOT OPENAL_LIB)
38
39
40
41 # OPENAL_INCLUDE_DIR
42
43 if (DARWIN)
44 set(OPENAL_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include/AL)
45 else (DARWIN)
46 find_path(OPENAL_INCLUDE_DIR
47 NAMES al.h
48 PATHS ${LIBS_PREBUILT_DIR}/include/AL
49 )
50 endif (DARWIN)
51
52 if (NOT OPENAL_INCLUDE_DIR)
53 message(FATAL_ERROR "al.h not found!")
54 else (NOT OPENAL_INCLUDE_DIR)
55 # message(STATUS "al.h found in: ${OPENAL_INCLUDE_DIR}")
56 endif (NOT OPENAL_INCLUDE_DIR)
57
58
59
60 # ALUT_LIB
61
62 if (WINDOWS)
63 set(ALUT_LIB
64 optimized ${ARCH_PREBUILT_DIRS_RELEASE}/alut.lib
65 debug ${ARCH_PREBUILT_DIRS_DEBUG}/alut.lib
66 )
67 elseif (DARWIN)
68 find_library( ALUT_LIB
69 NAMES alut.0
70 PATHS ${ARCH_PREBUILT_DIRS_RELEASE}
71 NO_DEFAULT_PATH
72 )
73 else (WINDOWS)
74 set(ALUT_LIB alut)
75 endif (WINDOWS)
76
77 if (NOT ALUT_LIB)
78 message(FATAL_ERROR "ALUT not found!")
79 else (NOT ALUT_LIB)
80 # message(STATUS "ALUT found: ${ALUT_LIB}")
81 endif (NOT ALUT_LIB)
82
83
84
85 # ALUT_INCLUDE_DIR
86
87 find_path(ALUT_INCLUDE_DIR
88 NAMES alut.h
89 PATHS ${OPENAL_INCLUDE_DIR}
90 )
91
92 if (NOT ALUT_INCLUDE_DIR)
93 message(FATAL_ERROR "alut.h not found!")
94 else (NOT ALUT_INCLUDE_DIR)
95 # message(STATUS "alut.h found in: ${ALUT_INCLUDE_DIR}")
96 endif (NOT ALUT_INCLUDE_DIR)
97
98
99
100 set(OPENAL_LIBRARIES
101 ${OPENAL_LIB}
102 ${ALUT_LIB}
103 )
104
105 set(OPENAL_INCLUDE_DIRS
106 ${OPENAL_INCLUDE_DIR}
107 ${ALUT_INCLUDE_DIR}
108 )
109
110
111 set(OPENAL_FOUND TRUE CACHE BOOL
112 "Found OpenAL and ALUT libraries successfully"
113 )
114
115endif (OPENAL)
diff --git a/linden/indra/cmake/PluginAPI.cmake b/linden/indra/cmake/PluginAPI.cmake
new file mode 100644
index 0000000..d1649e8
--- /dev/null
+++ b/linden/indra/cmake/PluginAPI.cmake
@@ -0,0 +1,16 @@
1# -*- cmake -*-
2
3if (WINDOWS)
4 set(PLUGIN_API_WINDOWS_LIBRARIES
5 wsock32
6 ws2_32
7 psapi
8 netapi32
9 advapi32
10 user32
11 )
12else (WINDOWS)
13 set(PLUGIN_API_WINDOWS_LIBRARIES "")
14endif (WINDOWS)
15
16
diff --git a/linden/indra/cmake/QuickTimePlugin.cmake b/linden/indra/cmake/QuickTimePlugin.cmake
new file mode 100644
index 0000000..8afd8f3
--- /dev/null
+++ b/linden/indra/cmake/QuickTimePlugin.cmake
@@ -0,0 +1,46 @@
1# -*- cmake -*-
2
3if(INSTALL_PROPRIETARY)
4 include(Prebuilt)
5 use_prebuilt_binary(quicktime)
6endif(INSTALL_PROPRIETARY)
7
8if (DARWIN)
9 include(CMakeFindFrameworks)
10 find_library(QUICKTIME_LIBRARY QuickTime)
11elseif (WINDOWS)
12 set(QUICKTIME_SDK_DIR "$ENV{PROGRAMFILES}/QuickTime SDK"
13 CACHE PATH "Location of the QuickTime SDK.")
14
15 find_library(DEBUG_QUICKTIME_LIBRARY qtmlclient
16 PATHS
17 ${ARCH_PREBUILT_DIRS_DEBUG}
18 "${QUICKTIME_SDK_DIR}\\libraries"
19 )
20
21 find_library(RELEASE_QUICKTIME_LIBRARY qtmlclient
22 PATHS
23 ${ARCH_PREBUILT_DIRS_RELEASE}
24 "${QUICKTIME_SDK_DIR}\\libraries"
25 )
26
27 if (DEBUG_QUICKTIME_LIBRARY AND RELEASE_QUICKTIME_LIBRARY)
28 set(QUICKTIME_LIBRARY
29 optimized ${RELEASE_QUICKTIME_LIBRARY}
30 debug ${DEBUG_QUICKTIME_LIBRARY}
31 )
32
33 endif (DEBUG_QUICKTIME_LIBRARY AND RELEASE_QUICKTIME_LIBRARY)
34
35 include_directories(
36 ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include/quicktime
37 "${QUICKTIME_SDK_DIR}\\CIncludes"
38 )
39endif (DARWIN)
40
41mark_as_advanced(QUICKTIME_LIBRARY)
42
43if (QUICKTIME_LIBRARY)
44 set(QUICKTIME ON CACHE BOOL "Build with QuickTime streaming media support.")
45endif (QUICKTIME_LIBRARY)
46
diff --git a/linden/indra/cmake/WebKitLibPlugin.cmake b/linden/indra/cmake/WebKitLibPlugin.cmake
new file mode 100644
index 0000000..23958fe
--- /dev/null
+++ b/linden/indra/cmake/WebKitLibPlugin.cmake
@@ -0,0 +1,55 @@
1# -*- cmake -*-
2include(Linking)
3include(Prebuilt)
4
5if (STANDALONE)
6 set(WEBKITLIBPLUGIN OFF CACHE BOOL
7 "WEBKITLIBPLUGIN support for the llplugin/llmedia test apps.")
8else (STANDALONE)
9 use_prebuilt_binary(llqtwebkit)
10 set(WEBKITLIBPLUGIN ON CACHE BOOL
11 "WEBKITLIBPLUGIN support for the llplugin/llmedia test apps.")
12endif (STANDALONE)
13
14if (WINDOWS)
15 set(WEBKIT_PLUGIN_LIBRARIES
16 debug llqtwebkitd
17 debug QtWebKitd4
18 debug QtOpenGLd4
19 debug QtNetworkd4
20 debug QtGuid4
21 debug QtCored4
22 debug qtmaind
23 optimized llqtwebkit
24 optimized QtWebKit4
25 optimized QtOpenGL4
26 optimized QtNetwork4
27 optimized QtGui4
28 optimized QtCore4
29 optimized qtmain
30 )
31elseif (DARWIN)
32 set(WEBKIT_PLUGIN_LIBRARIES
33 optimized ${ARCH_PREBUILT_DIRS_RELEASE}/libllqtwebkit.dylib
34 debug ${ARCH_PREBUILT_DIRS_RELEASE}/libllqtwebkit.dylib
35 )
36elseif (LINUX)
37 if (STANDALONE)
38 set(WEBKIT_PLUGIN_LIBRARIES llqtwebkit)
39 else (STANDALONE)
40 set(WEBKIT_PLUGIN_LIBRARIES
41 llqtwebkit
42 qgif
43 qjpeg
44 QtWebKit
45 QtOpenGL
46 QtNetwork
47 QtGui
48 QtCore
49 fontconfig
50 X11
51 Xrender
52 GL
53 )
54 endif (STANDALONE)
55endif (WINDOWS)
diff --git a/linden/indra/cmake/linden%2findra%2fcmake%2fCopyWinLibs.cmake.rej.txt b/linden/indra/cmake/linden%2findra%2fcmake%2fCopyWinLibs.cmake.rej.txt
new file mode 100644
index 0000000..295c9fe
--- /dev/null
+++ b/linden/indra/cmake/linden%2findra%2fcmake%2fCopyWinLibs.cmake.rej.txt
@@ -0,0 +1,257 @@
1***************
2*** 15,35 ****
3 wrap_oal.dll
4 )
5
6 set(debug_src_dir "${CMAKE_SOURCE_DIR}/../libraries/i686-win32/lib/debug")
7 set(debug_files
8- freebl3.dll
9- js3250.dll
10- nspr4.dll
11- nss3.dll
12- nssckbi.dll
13- plc4.dll
14- plds4.dll
15- smime3.dll
16- softokn3.dll
17- ssl3.dll
18- xpcom.dll
19- xul.dll
20 openjpegd.dll
21- windbgdlg.exe
22 )
23
24--- 15,30 ----
25 wrap_oal.dll
26 )
27+ copy_if_different(
28+ ${vivox_src_dir}
29+ "${CMAKE_CURRENT_BINARY_DIR}/Debug"
30+ out_targets
31+ ${vivox_files}
32+ )
33+ set(all_targets ${all_targets} ${out_targets})
34+
35
36 set(debug_src_dir "${CMAKE_SOURCE_DIR}/../libraries/i686-win32/lib/debug")
37 set(debug_files
38 openjpegd.dll
39 )
40
41***************
42*** 42,50 ****
43 set(all_targets ${all_targets} ${out_targets})
44
45- copy_if_different(
46- ${vivox_src_dir}
47- "${CMAKE_CURRENT_BINARY_DIR}/Debug"
48- out_targets
49- ${vivox_files}
50 )
51 set(all_targets ${all_targets} ${out_targets})
52--- 37,206 ----
53 set(all_targets ${all_targets} ${out_targets})
54
55+ # Debug config runtime files required for the plugin test mule
56+ set(plugintest_debug_src_dir "${CMAKE_SOURCE_DIR}/../libraries/i686-win32/lib/debug")
57+ set(plugintest_debug_files
58+ libeay32.dll
59+ libglib-2.0-0.dll
60+ libgmodule-2.0-0.dll
61+ libgobject-2.0-0.dll
62+ libgthread-2.0-0.dll
63+ qtcored4.dll
64+ qtguid4.dll
65+ qtnetworkd4.dll
66+ qtopengld4.dll
67+ qtwebkitd4.dll
68+ ssleay32.dll
69+ )
70+ copy_if_different(
71+ ${plugintest_debug_src_dir}
72+ "${CMAKE_CURRENT_BINARY_DIR}/../test_apps/llplugintest/Debug"
73+ out_targets
74+ ${plugintest_debug_files}
75+ )
76+ set(all_targets ${all_targets} ${out_targets})
77+
78+ # Debug config runtime files required for the plugin test mule (Qt image format plugins)
79+ set(plugintest_debug_src_dir "${CMAKE_SOURCE_DIR}/../libraries/i686-win32/lib/debug/imageformats")
80+ set(plugintest_debug_files
81+ qgifd4.dll
82+ qicod4.dll
83+ qjpegd4.dll
84+ qmngd4.dll
85+ qsvgd4.dll
86+ qtiffd4.dll
87+ )
88+ copy_if_different(
89+ ${plugintest_debug_src_dir}
90+ "${CMAKE_CURRENT_BINARY_DIR}/../test_apps/llplugintest/Debug/imageformats"
91+ out_targets
92+ ${plugintest_debug_files}
93+ )
94+ set(all_targets ${all_targets} ${out_targets})
95+
96+ copy_if_different(
97+ ${plugintest_debug_src_dir}
98+ "${CMAKE_CURRENT_BINARY_DIR}/llplugin/imageformats"
99+ out_targets
100+ ${plugintest_debug_files}
101+ )
102+ set(all_targets ${all_targets} ${out_targets})
103+
104+ # Release & ReleaseDebInfo config runtime files required for the plugin test mule
105+ set(plugintest_release_src_dir "${CMAKE_SOURCE_DIR}/../libraries/i686-win32/lib/release")
106+ set(plugintest_release_files
107+ libeay32.dll
108+ libglib-2.0-0.dll
109+ libgmodule-2.0-0.dll
110+ libgobject-2.0-0.dll
111+ libgthread-2.0-0.dll
112+ # llkdu.dll (not required for plugin test)
113+ qtcore4.dll
114+ qtgui4.dll
115+ qtnetwork4.dll
116+ qtopengl4.dll
117+ qtwebkit4.dll
118+ ssleay32.dll
119+ )
120+ copy_if_different(
121+ ${plugintest_release_src_dir}
122+ "${CMAKE_CURRENT_BINARY_DIR}/../test_apps/llplugintest/Release"
123+ out_targets
124+ ${plugintest_release_files}
125+ )
126+ set(all_targets ${all_targets} ${out_targets})
127+
128+ copy_if_different(
129+ ${plugintest_release_src_dir}
130+ "${CMAKE_CURRENT_BINARY_DIR}/../test_apps/llplugintest/RelWithDebInfo"
131+ out_targets
132+ ${plugintest_release_files}
133+ )
134+ set(all_targets ${all_targets} ${out_targets})
135+
136+ # Release & ReleaseDebInfo config runtime files required for the plugin test mule (Qt image format plugins)
137+ set(plugintest_release_src_dir "${CMAKE_SOURCE_DIR}/../libraries/i686-win32/lib/release/imageformats")
138+ set(plugintest_release_files
139+ qgif4.dll
140+ qico4.dll
141+ qjpeg4.dll
142+ qmng4.dll
143+ qsvg4.dll
144+ qtiff4.dll
145+ )
146+ copy_if_different(
147+ ${plugintest_release_src_dir}
148+ "${CMAKE_CURRENT_BINARY_DIR}/../test_apps/llplugintest/Release/imageformats"
149+ out_targets
150+ ${plugintest_release_files}
151+ )
152+ set(all_targets ${all_targets} ${out_targets})
153+
154+ copy_if_different(
155+ ${plugintest_release_src_dir}
156+ "${CMAKE_CURRENT_BINARY_DIR}/../test_apps/llplugintest/RelWithDebInfo/imageformats"
157+ out_targets
158+ ${plugintest_release_files}
159+ )
160+ set(all_targets ${all_targets} ${out_targets})
161+
162+ copy_if_different(
163+ ${plugintest_release_src_dir}
164+ "${CMAKE_CURRENT_BINARY_DIR}/Release/llplugin/imageformats"
165+ out_targets
166+ ${plugintest_release_files}
167+ )
168+ set(all_targets ${all_targets} ${out_targets})
169+
170+ copy_if_different(
171+ ${plugintest_release_src_dir}
172+ "${CMAKE_CURRENT_BINARY_DIR}/RelWithDebInfo/llplugin/imageformats"
173+ out_targets
174+ ${plugintest_release_files}
175+ )
176+ set(all_targets ${all_targets} ${out_targets})
177+
178+ # Debug config runtime files required for the plugins
179+ set(plugins_debug_src_dir "${CMAKE_SOURCE_DIR}/../libraries/i686-win32/lib/debug")
180+ set(plugins_debug_files
181+ libeay32.dll
182+ qtcored4.dll
183+ qtguid4.dll
184+ qtnetworkd4.dll
185+ qtopengld4.dll
186+ qtwebkitd4.dll
187+ ssleay32.dll
188+ )
189+ copy_if_different(
190+ ${plugins_debug_src_dir}
191+ "${CMAKE_CURRENT_BINARY_DIR}/Debug/llplugin"
192+ out_targets
193+ ${plugins_debug_files}
194+ )
195+ set(all_targets ${all_targets} ${out_targets})
196+
197+ # Release & ReleaseDebInfo config runtime files required for the plugins
198+ set(plugins_release_src_dir "${CMAKE_SOURCE_DIR}/../libraries/i686-win32/lib/release")
199+ set(plugins_release_files
200+ libeay32.dll
201+ qtcore4.dll
202+ qtgui4.dll
203+ qtnetwork4.dll
204+ qtopengl4.dll
205+ qtwebkit4.dll
206+ ssleay32.dll
207+ )
208+ copy_if_different(
209+ ${plugins_release_src_dir}
210+ "${CMAKE_CURRENT_BINARY_DIR}/Release/llplugin"
211+ out_targets
212+ ${plugins_release_files}
213+ )
214+ set(all_targets ${all_targets} ${out_targets})
215+
216+ copy_if_different(
217+ ${plugins_release_src_dir}
218+ "${CMAKE_CURRENT_BINARY_DIR}/RelWithDebInfo/llplugin"
219+ out_targets
220+ ${plugins_release_files}
221 )
222 set(all_targets ${all_targets} ${out_targets})
223***************
224*** 52,67 ****
225 set(release_src_dir "${CMAKE_SOURCE_DIR}/../libraries/i686-win32/lib/release")
226 set(release_files
227- freebl3.dll
228- js3250.dll
229- nspr4.dll
230- nss3.dll
231- nssckbi.dll
232- plc4.dll
233- plds4.dll
234- smime3.dll
235- softokn3.dll
236- ssl3.dll
237- xpcom.dll
238- xul.dll
239 openjpeg.dll
240 )
241--- 208,211 ----
242 set(release_src_dir "${CMAKE_SOURCE_DIR}/../libraries/i686-win32/lib/release")
243 set(release_files
244 openjpeg.dll
245 )
246***************
247*** 252,256 ****
248 ${debug_appconfig_file}
249 )
250- add_dependencies(copy_win_libs prepare)
251
252 if(EXISTS ${internal_llkdu_path})
253--- 396,399 ----
254 ${debug_appconfig_file}
255 )
256
257 if(EXISTS ${internal_llkdu_path})
generated by cgit v1.1 at 2025-02-28 11:09:05 +0000