From ab9e83030671f0d309eada847af7055213dfe501 Mon Sep 17 00:00:00 2001
From: callum_linden <none@none>
Date: Tue, 24 Mar 2015 00:42:42 +0100
Subject: Refer to new QuickTime third party package with fixes for VS2013 &
 re-add QuickTime media plugin

---
 indra/cmake/CMakeLists.txt | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'indra/cmake/CMakeLists.txt')

diff --git a/indra/cmake/CMakeLists.txt b/indra/cmake/CMakeLists.txt
index cd7da5d6c1..8d43afd1e2 100755
--- a/indra/cmake/CMakeLists.txt
+++ b/indra/cmake/CMakeLists.txt
@@ -82,18 +82,18 @@ set(cmake_SOURCE_FILES
     LLXML.cmake
     LScript.cmake
     Linking.cmake
-##  MediaPluginBase.cmake
+    MediaPluginBase.cmake
     NDOF.cmake
     OPENAL.cmake
     OpenGL.cmake
     OpenJPEG.cmake
     OpenSSL.cmake
     PNG.cmake
-##  PluginAPI.cmake
+    PluginAPI.cmake
     Prebuilt.cmake
     PulseAudio.cmake
     Python.cmake
-##  QuickTimePlugin.cmake
+    QuickTimePlugin.cmake
     TemplateCheck.cmake
     Tut.cmake
     UI.cmake
-- 
cgit v1.2.3


From dbdef626d650de288697848977155e223cbba9ad Mon Sep 17 00:00:00 2001
From: callum_linden <none@none>
Date: Tue, 24 Mar 2015 17:22:58 -0700
Subject: Add new media plugin (currently renders squares as example) in
 preparation for new CEF code

---
 indra/cmake/CMakeLists.txt | 1 +
 1 file changed, 1 insertion(+)

(limited to 'indra/cmake/CMakeLists.txt')

diff --git a/indra/cmake/CMakeLists.txt b/indra/cmake/CMakeLists.txt
index 8d43afd1e2..2298b0f284 100755
--- a/indra/cmake/CMakeLists.txt
+++ b/indra/cmake/CMakeLists.txt
@@ -14,6 +14,7 @@ set(cmake_SOURCE_FILES
     Boost.cmake
     BuildVersion.cmake
     CARes.cmake
+    CEFPlugin.cmake
     CMakeCopyIfDifferent.cmake
     ConfigurePkgConfig.cmake
     CURL.cmake
-- 
cgit v1.2.3


From cb7f84a470d7afeb1501cf5514333c6ee15d96df Mon Sep 17 00:00:00 2001
From: Rider Linden <rider@lindenlab.com>
Date: Fri, 2 Oct 2015 11:14:28 -0700
Subject: MAINT-5687: Remove old webkit from the make files and the repo. 
 Ensure that it is no longer meaningfully referenced.

---
 indra/cmake/CMakeLists.txt | 1 -
 1 file changed, 1 deletion(-)

(limited to 'indra/cmake/CMakeLists.txt')

diff --git a/indra/cmake/CMakeLists.txt b/indra/cmake/CMakeLists.txt
index 2298b0f284..4dd69649d0 100755
--- a/indra/cmake/CMakeLists.txt
+++ b/indra/cmake/CMakeLists.txt
@@ -103,7 +103,6 @@ set(cmake_SOURCE_FILES
     Variables.cmake
     ViewerMiscLibs.cmake
     VisualLeakDetector.cmake
-##  WebKitLibPlugin.cmake
     XmlRpcEpi.cmake
     ZLIB.cmake
     )
-- 
cgit v1.2.3