aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/cmake
diff options
context:
space:
mode:
authorJacek Antonelli2009-03-11 14:16:02 -0500
committerJacek Antonelli2009-03-11 17:13:22 -0500
commit629af1f4df0f1df3c3258e1eb21ee9966171ab3d (patch)
treed0fd8059faddbc55c618788f2add5710be923de7 /linden/indra/cmake
parentManifest includes openal and gstreamer libs in Mac package (diff)
downloadmeta-impy-629af1f4df0f1df3c3258e1eb21ee9966171ab3d.zip
meta-impy-629af1f4df0f1df3c3258e1eb21ee9966171ab3d.tar.gz
meta-impy-629af1f4df0f1df3c3258e1eb21ee9966171ab3d.tar.bz2
meta-impy-629af1f4df0f1df3c3258e1eb21ee9966171ab3d.tar.xz
Removed Quicktime-related cmake code
Diffstat (limited to '')
-rw-r--r--linden/indra/cmake/LLMedia.cmake2
-rw-r--r--linden/indra/cmake/QuickTime.cmake49
2 files changed, 0 insertions, 51 deletions
diff --git a/linden/indra/cmake/LLMedia.cmake b/linden/indra/cmake/LLMedia.cmake
index b7bf11c..8a36a69 100644
--- a/linden/indra/cmake/LLMedia.cmake
+++ b/linden/indra/cmake/LLMedia.cmake
@@ -1,7 +1,6 @@
1# -*- cmake -*- 1# -*- cmake -*-
2 2
3include(GStreamer) 3include(GStreamer)
4include(QuickTime)
5 4
6set(LLMEDIA_INCLUDE_DIRS 5set(LLMEDIA_INCLUDE_DIRS
7 ${LIBS_OPEN_DIR}/llmedia 6 ${LIBS_OPEN_DIR}/llmedia
@@ -11,5 +10,4 @@ set(LLMEDIA_LIBRARIES
11 llmedia 10 llmedia
12 ${GSTREAMER_LIBRARIES} 11 ${GSTREAMER_LIBRARIES}
13 ${GSTREAMER_PLUGINS_BASE_LIBRARIES} 12 ${GSTREAMER_PLUGINS_BASE_LIBRARIES}
14 ${QUICKTIME_LIBRARY}
15 ) 13 )
diff --git a/linden/indra/cmake/QuickTime.cmake b/linden/indra/cmake/QuickTime.cmake
deleted file mode 100644
index 4352709..0000000
--- a/linden/indra/cmake/QuickTime.cmake
+++ /dev/null
@@ -1,49 +0,0 @@
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
47if (QUICKTIME)
48 add_definitions(-DLL_QUICKTIME_ENABLED=1)
49endif (QUICKTIME)