aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/cmake
diff options
context:
space:
mode:
authorJacek Antonelli2009-03-08 14:59:57 -0500
committerJacek Antonelli2009-03-08 14:59:57 -0500
commit94ba8cdc2ab88697abb339829590776ec9b2843e (patch)
tree27fb7e67494fcf031700842177203611f683c96d /linden/indra/cmake
parentMoved Info-SecondLife.plist to Info-Imprudence.plist (diff)
downloadmeta-impy-94ba8cdc2ab88697abb339829590776ec9b2843e.zip
meta-impy-94ba8cdc2ab88697abb339829590776ec9b2843e.tar.gz
meta-impy-94ba8cdc2ab88697abb339829590776ec9b2843e.tar.bz2
meta-impy-94ba8cdc2ab88697abb339829590776ec9b2843e.tar.xz
Tweaked GStreamer.cmake to work on Mac
Diffstat (limited to 'linden/indra/cmake')
-rw-r--r--linden/indra/cmake/GStreamer.cmake44
1 files changed, 30 insertions, 14 deletions
diff --git a/linden/indra/cmake/GStreamer.cmake b/linden/indra/cmake/GStreamer.cmake
index b4b984d..8467dcd 100644
--- a/linden/indra/cmake/GStreamer.cmake
+++ b/linden/indra/cmake/GStreamer.cmake
@@ -54,10 +54,6 @@ if (WINDOWS)
54 54
55else (WINDOWS) 55else (WINDOWS)
56 56
57 include(FindPkgConfig)
58
59 pkg_check_modules(GSTREAMER REQUIRED gstreamer-0.10)
60 pkg_check_modules(GSTREAMER_PLUGINS_BASE REQUIRED gstreamer-plugins-base-0.10)
61 set(GSTREAMER_INCLUDE_DIRS 57 set(GSTREAMER_INCLUDE_DIRS
62 ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include/gstreamer-0.10 58 ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include/gstreamer-0.10
63 ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include/glib-2.0 59 ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include/glib-2.0
@@ -66,16 +62,36 @@ else (WINDOWS)
66 ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include/libxml2 62 ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include/libxml2
67 ) 63 )
68 64
69 # We don't need to explicitly link against gstreamer itself, because 65 if (DARWIN)
70 # LLMediaImplGStreamer probes for the system's copy at runtime. 66
71 set(GSTREAMER_LIBRARIES 67 set(GSTREAMER_LIBRARIES
72 gobject-2.0 68 xml2
73 gmodule-2.0 69 glib-2.0
74 dl 70 gobject-2.0
75 gthread-2.0 71 gmodule-2.0
76 rt 72 gthread-2.0
77 glib-2.0 73 gstreamer-0.10
78 ) 74 )
75
76 else (DARWIN)
77
78 include(FindPkgConfig)
79
80 pkg_check_modules(GSTREAMER REQUIRED gstreamer-0.10)
81 pkg_check_modules(GSTREAMER_PLUGINS_BASE REQUIRED gstreamer-plugins-base-0.10)
82
83 # We don't need to explicitly link against gstreamer itself, because
84 # LLMediaImplGStreamer probes for the system's copy at runtime.
85 set(GSTREAMER_LIBRARIES
86 gobject-2.0
87 gmodule-2.0
88 dl
89 gthread-2.0
90 rt
91 glib-2.0
92 )
93
94 endif (DARWIN)
79 95
80endif (WINDOWS) 96endif (WINDOWS)
81 97