# HG changeset patch
# User Ima Mechanique
# Date 1305825388 -3600
# Node ID b53b9762546351fc3ce3951cdcf01bb0bb5d7b86
# Parent  e67da2c6e3125966dd49eef98b36317afac1fcfe
Adding USE_QUICKTIME:BOOL cmake flag to allow use of quicktime media library without the use of the INSTALL_PROPRIETARY flag.

diff -r e67da2c6e312 -r b53b97625463 autobuild.xml
--- a/autobuild.xml	Mon May 16 14:57:15 2011 -0400
+++ b/autobuild.xml	Thu May 19 18:16:28 2011 +0100
@@ -2101,7 +2101,8 @@
                   <string>-G</string>
                   <string>"Visual Studio 10"</string>
                   <string>-DUNATTENDED:BOOL=ON</string>
-                  <string>-DINSTALL_PROPRIETARY=TRUE</string>
+                  <string>-DINSTALL_PROPRIETARY=FALSE</string>
+                  <string>-DUSE_QUICKTIME:BOOL=TRUE</string>
                   <string>-DUSE_KDU=FALSE</string>
                   <string>-DFMOD=FALSE</string>
                 </array>
@@ -2178,7 +2179,8 @@
                   <string>-G</string>
                   <string>"Visual Studio 10"</string>
                   <string>-DUNATTENDED:BOOL=ON</string>
-                  <string>-DINSTALL_PROPRIETARY=TRUE</string>
+                  <string>-DINSTALL_PROPRIETARY=FALSE</string>
+                  <string>-DUSE_QUICKTIME:BOOL=TRUE</string>
                   <string>-DUSE_KDU=FALSE</string>
                   <string>-DFMOD=FALSE</string>
                 </array>
@@ -2254,7 +2256,8 @@
                   <string>-G</string>
                   <string>"Visual Studio 10"</string>
                   <string>-DUNATTENDED:BOOL=ON</string>
-                  <string>-DINSTALL_PROPRIETARY=TRUE</string>
+                  <string>-DINSTALL_PROPRIETARY=FALSE</string>
+                  <string>-DUSE_QUICKTIME:BOOL=TRUE</string>
                   <string>-DUSE_KDU=FALSE</string>
                   <string>-DFMOD=FALSE</string>
                 </array>
diff -r e67da2c6e312 -r b53b97625463 indra/cmake/QuickTimePlugin.cmake
--- a/indra/cmake/QuickTimePlugin.cmake	Mon May 16 14:57:15 2011 -0400
+++ b/indra/cmake/QuickTimePlugin.cmake	Thu May 19 18:16:28 2011 +0100
@@ -1,9 +1,13 @@
 # -*- cmake -*-
 
 if(INSTALL_PROPRIETARY)
+  set(USE_QUICKTIME ON CACHE BOOL "Use Quicktime media library.")
+endif(INSTALL_PROPRIETARY)
+
+if(USE_QUICKTIME)
   include(Prebuilt)
   use_prebuilt_binary(quicktime)
-endif(INSTALL_PROPRIETARY)
+endif(USE_QUICKTIME)
 
 if (DARWIN)
   include(CMakeFindFrameworks)