From 24b570d89ceece4217839e0e77c0441dc1a82a4b Mon Sep 17 00:00:00 2001
From: Drake Arconis <drake@alchemyviewer.org>
Date: Sat, 16 Jan 2016 18:51:29 -0500
Subject: [PATCH] Add flag to use quicktime prebuilt

---
 indra/cmake/QuickTimePlugin.cmake | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/indra/cmake/QuickTimePlugin.cmake b/indra/cmake/QuickTimePlugin.cmake
index 171213d42..899a043e8 100644
--- a/indra/cmake/QuickTimePlugin.cmake
+++ b/indra/cmake/QuickTimePlugin.cmake
@@ -1,9 +1,11 @@
 # -*- cmake -*-
 
-if(INSTALL_PROPRIETARY)
+if(INSTALL_PROPRIETARY OR USE_QUICKTIME_PREBUILT)
   include(Prebuilt)
-  use_prebuilt_binary(quicktime)
-endif(INSTALL_PROPRIETARY)
+  if (WINDOWS)
+    use_prebuilt_binary(quicktime)
+  endif (WINDOWS)
+endif(INSTALL_PROPRIETARY OR USE_QUICKTIME_PREBUILT)
 
 if (DARWIN)
   include(CMakeFindFrameworks)
@@ -23,15 +25,13 @@ elseif (WINDOWS AND WORD_SIZE EQUAL 32)
 
   find_library(DEBUG_QUICKTIME_LIBRARY qtmlclient
                PATHS
-               ${LIBS_PREBUILT_DIR}/lib/debug
-			   ${LIBS_PREBUILT_LEGACY_DIR}/lib/debug
+               ${ARCH_PREBUILT_DIRS_DEBUG}
                "${QUICKTIME_SDK_DIR}\\libraries"
                )
 
   find_library(RELEASE_QUICKTIME_LIBRARY qtmlclient
                PATHS
-               ${LIBS_PREBUILT_DIR}/lib/release
-			   ${LIBS_PREBUILT_LEGACY_DIR}/lib/release
+               ${ARCH_PREBUILT_DIRS_RELEASE}
                "${QUICKTIME_SDK_DIR}\\libraries"
                )
 
@@ -45,7 +45,6 @@ elseif (WINDOWS AND WORD_SIZE EQUAL 32)
   
   include_directories(
     ${LIBS_PREBUILT_DIR}/include/quicktime
-    ${LIBS_PREBUILT_LEGACY_DIR}/include/quicktime
     "${QUICKTIME_SDK_DIR}\\CIncludes"
     )
 endif (DARWIN)