diff options
| author | Loren Shih <seraph@lindenlab.com> | 2010-10-26 11:34:41 -0400 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2010-10-26 11:34:41 -0400 |
| commit | 40689e5b325d2f31c45b377effe6334f0b37c5f2 (patch) | |
| tree | 7f8048ddaf3971ff1dddfd0c2e6b3e8fde61e734 /indra/cmake | |
| parent | af57ff75dea16ed857c27ebfa288b9881668e9ac (diff) | |
| parent | a40a2a7a465f6e03ca495c301dfbf7bfa376be30 (diff) | |
Automated merge up from viewer-development
Diffstat (limited to 'indra/cmake')
| -rw-r--r-- | indra/cmake/FMOD.cmake | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/indra/cmake/FMOD.cmake b/indra/cmake/FMOD.cmake index 96434e38fa..dcf44cd642 100644 --- a/indra/cmake/FMOD.cmake +++ b/indra/cmake/FMOD.cmake @@ -7,8 +7,10 @@ if (FMOD) set(FMOD_FIND_REQUIRED ON) include(FindFMOD) else (STANDALONE) - include(Prebuilt) - use_prebuilt_binary(fmod) + if (INSTALL_PROPRIETARY) + include(Prebuilt) + use_prebuilt_binary(fmod) + endif (INSTALL_PROPRIETARY) if (WINDOWS) set(FMOD_LIBRARY fmod) |