From 629af1f4df0f1df3c3258e1eb21ee9966171ab3d Mon Sep 17 00:00:00 2001
From: Jacek Antonelli
Date: Wed, 11 Mar 2009 14:16:02 -0500
Subject: Removed Quicktime-related cmake code

---
 ChangeLog.txt                       | 12 +++++++++
 linden/indra/cmake/LLMedia.cmake    |  2 --
 linden/indra/cmake/QuickTime.cmake  | 49 -------------------------------------
 linden/indra/llmedia/CMakeLists.txt | 13 ----------
 linden/indra/newview/CMakeLists.txt |  1 -
 5 files changed, 12 insertions(+), 65 deletions(-)
 delete mode 100644 linden/indra/cmake/QuickTime.cmake

diff --git a/ChangeLog.txt b/ChangeLog.txt
index 02a248f..ef9c016 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -1,3 +1,15 @@
+2009-03-11  Jacek Antonelli  <jacek.antonelli@gmail.com>
+
+	* linden/indra/cmake/LLMedia.cmake:
+	Removed Quicktime-related cmake code.
+	* linden/indra/cmake/LLMedia.cmake:
+	Ditto.
+	* linden/indra/llmedia/CMakeLists.txt:
+	Ditto.
+	* linden/indra/newview/CMakeLists.txt:
+	Ditto.
+
+
 2009-03-09  Jacek Antonelli  <jacek.antonelli@gmail.com>
 
 	* linden/indra/newview/viewer_manifest.py:
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 @@
 # -*- cmake -*-
 
 include(GStreamer)
-include(QuickTime)
 
 set(LLMEDIA_INCLUDE_DIRS
     ${LIBS_OPEN_DIR}/llmedia
@@ -11,5 +10,4 @@ set(LLMEDIA_LIBRARIES
     llmedia
     ${GSTREAMER_LIBRARIES}
     ${GSTREAMER_PLUGINS_BASE_LIBRARIES}
-    ${QUICKTIME_LIBRARY}
     )
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 @@
-# -*- cmake -*-
-
-if(INSTALL_PROPRIETARY)
-  include(Prebuilt)
-  use_prebuilt_binary(quicktime)
-endif(INSTALL_PROPRIETARY)
-
-if (DARWIN)
-  include(CMakeFindFrameworks)
-  find_library(QUICKTIME_LIBRARY QuickTime)
-elseif (WINDOWS)
-  set(QUICKTIME_SDK_DIR "$ENV{PROGRAMFILES}/QuickTime SDK"
-      CACHE PATH "Location of the QuickTime SDK.")
-
-  find_library(DEBUG_QUICKTIME_LIBRARY qtmlclient
-               PATHS
-               ${ARCH_PREBUILT_DIRS_DEBUG}
-               "${QUICKTIME_SDK_DIR}\\libraries"
-               )
-
-  find_library(RELEASE_QUICKTIME_LIBRARY qtmlclient
-               PATHS
-               ${ARCH_PREBUILT_DIRS_RELEASE}
-               "${QUICKTIME_SDK_DIR}\\libraries"
-               )
-
-  if (DEBUG_QUICKTIME_LIBRARY AND RELEASE_QUICKTIME_LIBRARY)
-    set(QUICKTIME_LIBRARY 
-        optimized ${RELEASE_QUICKTIME_LIBRARY}
-        debug ${DEBUG_QUICKTIME_LIBRARY}
-        )
-        
-  endif (DEBUG_QUICKTIME_LIBRARY AND RELEASE_QUICKTIME_LIBRARY)
-  
-  include_directories(
-    ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include/quicktime
-    "${QUICKTIME_SDK_DIR}\\CIncludes"
-    )
-endif (DARWIN)
-
-mark_as_advanced(QUICKTIME_LIBRARY)
-
-if (QUICKTIME_LIBRARY)
-  set(QUICKTIME ON CACHE BOOL "Build with QuickTime streaming media support.")
-endif (QUICKTIME_LIBRARY)
-
-if (QUICKTIME)
-  add_definitions(-DLL_QUICKTIME_ENABLED=1)
-endif (QUICKTIME)
diff --git a/linden/indra/llmedia/CMakeLists.txt b/linden/indra/llmedia/CMakeLists.txt
index 026afc1..084a80b 100644
--- a/linden/indra/llmedia/CMakeLists.txt
+++ b/linden/indra/llmedia/CMakeLists.txt
@@ -65,19 +65,6 @@ if (MOZLIB)
   list(APPEND llmedia_HEADER_FILES llmediaimplllmozlib.h)
 endif (MOZLIB)
 
-if (QUICKTIME)
-  list(APPEND llmedia_SOURCE_FILES llmediaimplquicktime.cpp)
-  list(APPEND llmedia_HEADER_FILES llmediaimplquicktime.h)
-
-  # We use a bunch of deprecated system APIs.
-  if (DARWIN)
-    set_source_files_properties(
-        llmediaimplquicktime.cpp PROPERTIES
-        COMPILE_FLAGS -Wno-deprecated-declarations
-        )
-  endif (DARWIN)
-endif (QUICKTIME)
-
 set_source_files_properties(${llmedia_HEADER_FILES}
                             PROPERTIES HEADER_FILE_ONLY TRUE)
 
diff --git a/linden/indra/newview/CMakeLists.txt b/linden/indra/newview/CMakeLists.txt
index 2bda223..f971f97 100644
--- a/linden/indra/newview/CMakeLists.txt
+++ b/linden/indra/newview/CMakeLists.txt
@@ -1393,7 +1393,6 @@ target_link_libraries(imprudence-bin
     ${SMARTHEAP_LIBRARY}
     ${UI_LIBRARIES}
     ${NDOF_LIBRARY}
-    ${QUICKTIME_LIBRARY}
     ${WINDOWS_LIBRARIES}
     ${XMLRPCEPI_LIBRARIES}
     ${ZLIB_LIBRARIES}
-- 
cgit v1.1