diff options
| author | Oz Linden <oz@lindenlab.com> | 2014-12-17 11:15:31 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2014-12-17 11:15:31 -0500 |
| commit | f8ed44f8ec80916e684c2783da02f89474710de6 (patch) | |
| tree | 2a4ca145439751e864beb6be91cde52a7901b036 /indra/cmake/Variables.cmake | |
| parent | 11ab03331f5028455a56245fc9121b82068565cc (diff) | |
| parent | 0d71baba74e2009e88471e2c44e78863b34a5817 (diff) | |
merge latest updates from nat and callum
Diffstat (limited to 'indra/cmake/Variables.cmake')
| -rwxr-xr-x | indra/cmake/Variables.cmake | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/cmake/Variables.cmake b/indra/cmake/Variables.cmake index 8e220162ce..faca12c347 100755 --- a/indra/cmake/Variables.cmake +++ b/indra/cmake/Variables.cmake @@ -26,6 +26,7 @@ set(VIEWER_PREFIX) set(INTEGRATION_TESTS_PREFIX) set(LL_TESTS ON CACHE BOOL "Build and run unit and integration tests (disable for build timing runs to reduce variation") set(INCREMENTAL_LINK OFF CACHE BOOL "Use incremental linking on win32 builds (enable for faster links on some machines)") +set(ENABLE_MEDIA_PLUGINS OFF CACHE BOOL "Turn off building media plugins if they are imported by third-party library mechanism") if(LIBS_CLOSED_DIR) file(TO_CMAKE_PATH "${LIBS_CLOSED_DIR}" LIBS_CLOSED_DIR) |