diff options
author | Rider Linden <rider@lindenlab.com> | 2015-12-18 10:16:26 -0800 |
---|---|---|
committer | Rider Linden <rider@lindenlab.com> | 2015-12-18 10:16:26 -0800 |
commit | 6dd80980cfa5be214c143d125cfabd006ea7ebff (patch) | |
tree | 102a4d2c7cddeec35feaf18e71cfb8f598001868 /indra/cmake/CMakeLists.txt | |
parent | 2af14639de9f575ac9a2766835206e5c6ffb46c8 (diff) | |
parent | 7b993d15b70d419dc0a7c8d92286d34a2635537d (diff) |
Merge
Diffstat (limited to 'indra/cmake/CMakeLists.txt')
-rwxr-xr-x | indra/cmake/CMakeLists.txt | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/indra/cmake/CMakeLists.txt b/indra/cmake/CMakeLists.txt index d700c7fd99..04a2a16c27 100755 --- a/indra/cmake/CMakeLists.txt +++ b/indra/cmake/CMakeLists.txt @@ -13,6 +13,7 @@ set(cmake_SOURCE_FILES BerkeleyDB.cmake Boost.cmake BuildVersion.cmake + CEFPlugin.cmake CMakeCopyIfDifferent.cmake ConfigurePkgConfig.cmake CURL.cmake @@ -79,18 +80,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 @@ -99,7 +100,6 @@ set(cmake_SOURCE_FILES Variables.cmake ViewerMiscLibs.cmake VisualLeakDetector.cmake -## WebKitLibPlugin.cmake XmlRpcEpi.cmake ZLIB.cmake ) |