diff options
| author | AndreyL ProductEngine <alihatskiy@productengine.com> | 2015-12-22 11:07:18 +0200 |
|---|---|---|
| committer | AndreyL ProductEngine <alihatskiy@productengine.com> | 2015-12-22 11:07:18 +0200 |
| commit | 60dfd55edaa5df0cb864dc5086037bc5625bc0be (patch) | |
| tree | 7140d0f8eddc02e7ee71fa03fc9aa4aa652cd476 /indra/cmake/Variables.cmake | |
| parent | 6e6d610a9905c1bceb9dd073c3eed87574fdcb29 (diff) | |
| parent | 7b993d15b70d419dc0a7c8d92286d34a2635537d (diff) | |
Merge downstream, version 4.0.1
Diffstat (limited to 'indra/cmake/Variables.cmake')
| -rwxr-xr-x | 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 100755 --- 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) |