diff options
| author | Oz Linden <oz@lindenlab.com> | 2016-01-15 16:55:04 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2016-01-15 16:55:04 -0500 |
| commit | bc22e587439a2822e5228508e7a4a1e2ec0121c5 (patch) | |
| tree | 442540d0c2760617a2c0cf0cb9ba1973ab6fb298 /indra/cmake/Variables.cmake | |
| parent | 317644f5d575ecd4e734c9a5327f2a062ebf914a (diff) | |
| parent | 5a5c023e291990a463b1a91846ce82c70da8daab (diff) | |
merge changes for 4.0.1-release
Diffstat (limited to 'indra/cmake/Variables.cmake')
| -rw-r--r-- | indra/cmake/Variables.cmake | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/cmake/Variables.cmake b/indra/cmake/Variables.cmake index 2fb47c58a7..63e296b556 100644 --- a/indra/cmake/Variables.cmake +++ b/indra/cmake/Variables.cmake @@ -26,7 +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") +set(ENABLE_MEDIA_PLUGINS ON 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) |