aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/cmake/GStreamer.cmake
diff options
context:
space:
mode:
authorJacek Antonelli2010-06-26 18:43:18 -0500
committerJacek Antonelli2010-06-26 19:01:38 -0500
commit3de0581adbb0d5d51a290ba75d0e27cdb1903b07 (patch)
tree30765ceecff14c2fcd0b8f18b8d62b2e7a64cbde /linden/indra/cmake/GStreamer.cmake
parentChanged version to Weekly 2010-06-26. (diff)
downloadmeta-impy-3de0581adbb0d5d51a290ba75d0e27cdb1903b07.zip
meta-impy-3de0581adbb0d5d51a290ba75d0e27cdb1903b07.tar.gz
meta-impy-3de0581adbb0d5d51a290ba75d0e27cdb1903b07.tar.bz2
meta-impy-3de0581adbb0d5d51a290ba75d0e27cdb1903b07.tar.xz
Fixed cmake not finding Mac libxml2 and libpng12.
Diffstat (limited to '')
-rw-r--r--linden/indra/cmake/GStreamer.cmake14
1 files changed, 1 insertions, 13 deletions
diff --git a/linden/indra/cmake/GStreamer.cmake b/linden/indra/cmake/GStreamer.cmake
index 55a8f43..f5f9c03 100644
--- a/linden/indra/cmake/GStreamer.cmake
+++ b/linden/indra/cmake/GStreamer.cmake
@@ -71,18 +71,6 @@ else (WINDOWS)
71 use_prebuilt_binary(neon) 71 use_prebuilt_binary(neon)
72 use_prebuilt_binary(theora) 72 use_prebuilt_binary(theora)
73 73
74 find_library( XML2_LIB
75 NAMES xml2.2
76 PATHS ${ARCH_PREBUILT_DIRS_RELEASE}
77 NO_DEFAULT_PATH
78 DOC "libxml2 dynamic library / shared object" )
79
80 if (NOT XML2_LIB)
81 message(FATAL_ERROR "libxml2 not found!")
82 else (NOT XML2_LIB)
83 #message(STATUS "libxml2 found: ${XML2_LIB}")
84 endif (NOT XML2_LIB)
85
86 set(GSTREAMER_LIBRARIES 74 set(GSTREAMER_LIBRARIES
87 gstvideo-0.10 75 gstvideo-0.10
88 gstaudio-0.10 76 gstaudio-0.10
@@ -92,7 +80,7 @@ else (WINDOWS)
92 gmodule-2.0 80 gmodule-2.0
93 gthread-2.0 81 gthread-2.0
94 glib-2.0 82 glib-2.0
95 ${XML2_LIB} 83 xml2.2
96 ) 84 )
97 85
98 else (DARWIN) # Linux 86 else (DARWIN) # Linux