diff options
Diffstat (limited to '')
-rw-r--r-- | linden/indra/cmake/GStreamer.cmake | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/linden/indra/cmake/GStreamer.cmake b/linden/indra/cmake/GStreamer.cmake index 8bfad11..51e1550 100644 --- a/linden/indra/cmake/GStreamer.cmake +++ b/linden/indra/cmake/GStreamer.cmake | |||
@@ -1,18 +1,19 @@ | |||
1 | # -*- cmake -*- | 1 | # -*- cmake -*- |
2 | include(Prebuilt) | 2 | include(Prebuilt) |
3 | 3 | ||
4 | # possible libxml should have its own .cmake file instead | 4 | # Maybe libxml and glib should have their own .cmake files |
5 | use_prebuilt_binary(libxml) | 5 | use_prebuilt_binary(libxml) |
6 | use_prebuilt_binary(glib) | ||
7 | |||
6 | set(GSTREAMER_FOUND ON FORCE BOOL) | 8 | set(GSTREAMER_FOUND ON FORCE BOOL) |
7 | set(GSTREAMER_PLUGINS_BASE_FOUND ON FORCE BOOL) | 9 | set(GSTREAMER_PLUGINS_BASE_FOUND ON FORCE BOOL) |
10 | |||
8 | use_prebuilt_binary(gstreamer) | 11 | use_prebuilt_binary(gstreamer) |
12 | use_prebuilt_binary(gstreamer-plugins) | ||
9 | 13 | ||
10 | if (WINDOWS) | 14 | if (WINDOWS) |
11 | 15 | ||
12 | use_prebuilt_binary(libxml) | ||
13 | use_prebuilt_binary(iconv) | 16 | use_prebuilt_binary(iconv) |
14 | use_prebuilt_binary(glib) | ||
15 | use_prebuilt_binary(gstreamer-plugins) | ||
16 | set(GSTREAMER_FOUND ON FORCE BOOL) | 17 | set(GSTREAMER_FOUND ON FORCE BOOL) |
17 | set(GSTREAMER_INCLUDE_DIRS | 18 | set(GSTREAMER_INCLUDE_DIRS |
18 | ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include/glib | 19 | ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include/glib |
@@ -63,7 +64,7 @@ else (WINDOWS) | |||
63 | ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include/libxml2 | 64 | ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include/libxml2 |
64 | ) | 65 | ) |
65 | 66 | ||
66 | if (DARWIN) | 67 | if (DARWIN) # Mac |
67 | 68 | ||
68 | find_library( XML2_LIB | 69 | find_library( XML2_LIB |
69 | NAMES xml2.2 | 70 | NAMES xml2.2 |
@@ -89,7 +90,9 @@ else (WINDOWS) | |||
89 | ${XML2_LIB} | 90 | ${XML2_LIB} |
90 | ) | 91 | ) |
91 | 92 | ||
92 | else (DARWIN) | 93 | else (DARWIN) # Linux |
94 | |||
95 | use_prebuilt_binary(theora) | ||
93 | 96 | ||
94 | set(GSTREAMER_LIBRARIES | 97 | set(GSTREAMER_LIBRARIES |
95 | gstvideo-0.10 | 98 | gstvideo-0.10 |