diff options
author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2015-12-18 13:55:41 -0500 |
---|---|---|
committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2015-12-18 13:55:41 -0500 |
commit | 3f81bb15b32cfa9db2a1a3cbcf0eb976b7751368 (patch) | |
tree | d534594be435e7cc1a5ca5c14b8b146ed47bb2e2 /indra/cmake/CMakeLists.txt | |
parent | 99f4b27020c101591de5c1cbe53185c610e48caa (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 cd7da5d6c1..4dd69649d0 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 @@ -82,18 +83,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 @@ -102,7 +103,6 @@ set(cmake_SOURCE_FILES Variables.cmake ViewerMiscLibs.cmake VisualLeakDetector.cmake -## WebKitLibPlugin.cmake XmlRpcEpi.cmake ZLIB.cmake ) |